Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -805,6 +805,22 @@ public class OrgUsrController extends BaseController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getParentId", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "查当前登录人的所属单位", notes = "查当前登录人的所属单位")
+	public ResponseModel<String> getParentId() {
+		ReginParams reginParams = getSelectedOrgInfo();
+		ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+		OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
+		String companyId = String.valueOf(orgUsr.getSequenceNbr());
+		//判断登陆人是否已经是顶级节点单位
+		if (orgUsr.getParentId() != null ) {
+			orgUsr  =orgUsrService.selectParentOrgUsr(orgUsr);
+			companyId = String.valueOf(orgUsr.getSequenceNbr());
+		}
+		return ResponseHelper.buildResponse(companyId);
+	}
+
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.latentdanger.business.dto.DangerExecuteSubmitDto;
 import com.yeejoin.amos.latentdanger.business.dto.ExecuteSubmitDto;
+import com.yeejoin.amos.latentdanger.business.feign.JcsFeignClient;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerDto;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerExecuteParam;
 import com.yeejoin.amos.latentdanger.business.param.LatentDangerListParam;
@@ -19,6 +20,7 @@ import com.yeejoin.amos.latentdanger.business.util.CommonResponseUtil;
 import com.yeejoin.amos.latentdanger.business.util.FileHelper;
 import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
+import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
 import com.yeejoin.amos.latentdanger.core.common.response.DangerListResponse;
 import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
 import io.swagger.annotations.Api;
@@ -40,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -60,6 +63,9 @@ public class LatentDangerController extends BaseController {
     @Autowired
     private ILatentDangerService iLatentDangerService;
 
+    @Autowired
+    private JcsFeignClient jcsFeignClient;
+
     @Value("${danger.biz.type}")
     private static final String bizType = "patrol";
 
@@ -324,6 +330,14 @@ public class LatentDangerController extends BaseController {
     public ResponseModel dangerAudit(@RequestBody LatentDangerDto latentDangerDto, @RequestParam Integer executeType) throws Exception {
         AgencyUserModel user = getUserInfo();
         ReginParams reginParams = getSelectedOrgInfo();
+//        当前登录人部门ID
+        if (LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(latentDangerDto.getDangerState())) {
+            String companyId = jcsFeignClient.getParentId().getResult();
+            String pointId = String.valueOf(latentDangerDto.getBizInfo().get("pointId"));
+            if (!companyId.equals(pointId)) {
+                throw new BadRequest("仅限责任单位下人员可分配任务");
+            }
+        }
         String deptId = getDepartmentId(reginParams);
         String departmentName = getDepartmentName(reginParams);
         String userRealName = user.getRealName();

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/feign/JcsFeignClient.java

@@ -42,4 +42,20 @@ public interface JcsFeignClient {
      */
     @GetMapping(value = "/org-usr/company/{ids}/person")
     FeignClientResult<List<CompanyPerson>> selectCompanyPerson(@PathVariable List<Long> ids);
+
+    /**
+     * 查当前登录人的所属单位
+     * @return
+     */
+    @GetMapping(value = "/org-usr/getParentId")
+    ResponseModel<String> getParentId();
+
+
+    /**
+     * 查询用户单位信息
+     * @param userId 用户id
+     * @return ResponseModel<ReginParams.PersonIdentity>
+     */
+    @GetMapping(value = "jcs/org-usr/{userId}/userUnit")
+    FeignClientResult getUserUnit(@PathVariable String userId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -2137,7 +2137,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         if (!CollectionUtils.isEmpty(dangerIdList)){
 		LatentDangerBo lanDer = latentDangerMapper.getById(Long.valueOf(dangerIdList.get(0)));
 		if (!ObjectUtils.isEmpty(lanDer)){
-			if ("dangerSubmit".equals(lanDer.getDangerState())){
+			if (!"isDraft".equals(lanDer.getDangerState())){
 				pageParam.remove("isDraft");
 			    }
 		    }