|
@@ -224,16 +224,11 @@ public class ContractApplyEvent extends BaseController {
|
|
|
Project project = projectService.selectById(entity.getProjectId());
|
|
|
List<Map<String, String>> userMaps = new ArrayList<>();
|
|
|
if(StringUtils.isNotBlank(project.getZrbmId())){
|
|
|
- CommonResult<DeptRespDTO> result = deptApi.getDept(project.getZrbmId());
|
|
|
- DeptRespDTO dept = result.getCheckedData();
|
|
|
- if(dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())){
|
|
|
- CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUserLeader(dept.getLeaderUserId());
|
|
|
- AdminUserRespDTO userLeader = userRes.getCheckedData();
|
|
|
- if(userLeader != null){
|
|
|
- HashMap<String,String> leaderMap = new HashMap<>();
|
|
|
- leaderMap.put("id",userLeader.getId());
|
|
|
- userMaps.add(leaderMap);
|
|
|
- }
|
|
|
+ DeptRespDTO deptRespDTO = deptApi.getSecondDeptByDeptId(project.getZrbmId()).getCheckedData();
|
|
|
+ if (deptRespDTO != null && StringUtils.isNotBlank(deptRespDTO.getLeaderUserId())) {
|
|
|
+ HashMap<String, String> map = new HashMap<>();
|
|
|
+ map.put("id", deptRespDTO.getLeaderUserId());
|
|
|
+ userMaps.add(map);
|
|
|
}
|
|
|
}
|
|
|
return ok(userMaps);
|