合同签订和用款市场部经理改为区域总监

zjugis-business/src/main/java/com/zjugis/business/flow/contract/event/ContractEvent.java

@@ -332,13 +332,9 @@ public class ContractEvent extends BaseController {
             if (StringUtils.isNotBlank(flowInstanceId)) {
                 Contract entity = contractService.selectByInstanceId(flowInstanceId);
                 List<Map<String, String>> userMaps = new ArrayList<>();
-                if(StringUtils.isNotBlank(entity.getAreaManagerId())){
-                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUser(entity.getAreaManagerId());
-                    AdminUserRespDTO user = userRes.getCheckedData();
-                    CommonResult<DeptRespDTO> deptRes  = deptApi.getDept(user.getDeptId());
-                    DeptRespDTO dept = deptRes.getCheckedData();
+                if(StringUtils.isNotBlank(entity.getAreaDirectorId())){
                     HashMap<String,String> leaderMap = new HashMap<>();
-                    leaderMap.put("id",dept.getLeaderUserId());
+                    leaderMap.put("id",entity.getAreaDirectorId());
                     userMaps.add(leaderMap);
                 }
                 return ok(userMaps);

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/event/UseMoneyEvent.java

@@ -2,6 +2,7 @@ package com.zjugis.business.flow.usemoney.event;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.base.Strings;
+import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.ContractApply;
 import com.zjugis.business.bean.entity.ContractSub;
 import com.zjugis.business.bean.entity.Project;
@@ -21,6 +22,7 @@ import com.zjugis.business.flow.usemoney.entity.UseMoneyDetailDO;
 import com.zjugis.business.flow.usemoney.service.UseMoneyDetailService;
 import com.zjugis.business.flow.usemoney.service.UseMoneyService;
 import com.zjugis.business.mapper.ContractApplyMapper;
+import com.zjugis.business.service.ContractService;
 import com.zjugis.business.service.ProjectCostService;
 import com.zjugis.business.service.ProjectService;
 import com.zjugis.framework.common.pojo.CommonResult;
@@ -87,6 +89,8 @@ public class UseMoneyEvent extends BaseController {
     private ProjectService projectService;
     @Resource
     private DeptLeaderApi deptLeaderApi;
+    @Resource
+    private ContractService contractService;
 
     @Autowired
     AdminUserApi adminUserApi;
@@ -688,14 +692,21 @@ public class UseMoneyEvent extends BaseController {
             if (StringUtils.isNotBlank(flowInstanceId)) {
                 UseMoneyDO entity = useMoneyService.findByInstanceId(flowInstanceId);
                 Project project = projectService.selectById(entity.getProjectId());
+                List<Contract> contracts = contractService.selectByProject(entity.getProjectId());
                 List<Map<String, String>> userMaps = new ArrayList<>();
-                if(StringUtils.isNotBlank(project.getXsryId())){
-                    CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUser(project.getXsryId());
-                    DeptRespDTO deptRespDTO = deptApi.getDept(userRes.getData().getDeptId()).getCheckedData();
-                    if(deptRespDTO != null){
-                        HashMap<String,String> leaderMap = new HashMap<>();
-                        leaderMap.put("id",deptRespDTO.getLeaderUserId());
-                        userMaps.add(leaderMap);
+                if(contracts.size()==1){
+                    HashMap<String,String> leaderMap = new HashMap<>();
+                    leaderMap.put("id",contracts.get(0).getAreaDirectorId());
+                    userMaps.add(leaderMap);
+                }else {
+                    if(StringUtils.isNotBlank(project.getXsryId())){
+                        CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUser(project.getXsryId());
+                        DeptRespDTO deptRespDTO = deptApi.getDept(userRes.getData().getDeptId()).getCheckedData();
+                        if(deptRespDTO != null){
+                            HashMap<String,String> leaderMap = new HashMap<>();
+                            leaderMap.put("id",deptRespDTO.getLeaderUserId());
+                            userMaps.add(leaderMap);
+                        }
                     }
                 }
                 return ok(userMaps);