Forráskód Böngészése

修复更新部门负责人的问题

lixing 4 éve
szülő
commit
53fe96da6f

+ 9 - 7
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java

@@ -218,17 +218,19 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
         // 将负责人的工作信息标记为主管
         List<String> managers = updateDepartmentDTO.getManagers();
+        // 修改原来部门的负责人工作信息
+        QueryWorkResumeDTO queryWorkResumeDTO = new QueryWorkResumeDTO();
+        queryWorkResumeDTO.setDepId(department.getId());
+        queryWorkResumeDTO.setIsLeader(BoolEnum.TRUE.getType());
+        List<WorkResume> workResumes = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
+        workResumes.forEach(workResume -> workResume.setIsLeader(BoolEnum.FALSE.getType()));
+        workResumeService.batchUpdateWorkResume(workResumes);
+
         if (!CollectionUtils.isEmpty(managers)) {
-            // 修改原来部门的负责人工作信息
-            QueryWorkResumeDTO queryWorkResumeDTO = new QueryWorkResumeDTO();
-            queryWorkResumeDTO.setDepId(department.getId());
-            queryWorkResumeDTO.setIsLeader(BoolEnum.TRUE.getType());
-            List<WorkResume> workResumes = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
-            workResumes.forEach(workResume -> workResume.setIsLeader(BoolEnum.FALSE.getType()));
-            workResumeService.batchUpdateWorkResume(workResumes);
             // 修改当前部门负责人的工作信息
             queryWorkResumeDTO.setPersonIds(managers);
             queryWorkResumeDTO.setIsLeader(BoolEnum.FALSE.getType());
+            workResumes = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
             workResumes.forEach(workResume -> workResume.setIsLeader(BoolEnum.TRUE.getType()));
             workResumeService.batchUpdateWorkResume(workResumes);
         }

+ 2 - 0
fm-person/src/main/resources/bootstrap.yml

@@ -2,5 +2,7 @@ spring:
   application:
     name: fm-person
 
+EUREKA_CLIENT_DEFAULT_ZONE: http://frame:123456@192.168.64.18:9931/eureka/
+