diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index cd0f894a..053d33bd 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -478,22 +478,27 @@ public class StaffServiceImpl extends ServiceImpl impleme type++; } String depId = departmentsStaffRelateEntity.getDepartmentId(); - departManagers.setDepartmentId(depId); + departManagers.setDepartmentId(depId);//设置返回的部门id + List staffEntities = null; while(type > 1){ //查找父级部门 DepartmentsEntity departmentsEntity = departmentsService.selectParentDepartmentByDepartmentId(depId); if(departmentsEntity != null){ depId = departmentsEntity.getDepartmentId(); + staffEntities = departmentsStaffRelateService.selectLeadersByDepartmentId(depId); + if(staffEntities.size() > 0){ + type--; + } }else{ log.info("没有找到父级部门,部门id{}", depId); departManagers.setManagers(new ArrayList<>()); return departManagers; } - type--; + } - List staffEntities = - departmentsStaffRelateService.selectLeadersByDepartmentId(depId); + /*List staffEntities = + departmentsStaffRelateService.selectLeadersByDepartmentId(depId);*/ departManagers.setManagers(staffEntities); if(staffEntities.size() == 0){ log.info("无法找到管理人员.部门id{}", depId);