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 053d33bd..bd7f069d 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 @@ -479,17 +479,19 @@ public class StaffServiceImpl extends ServiceImpl impleme } String depId = departmentsStaffRelateEntity.getDepartmentId(); departManagers.setDepartmentId(depId);//设置返回的部门id - List staffEntities = null; - while(type > 1){ + List staffEntities = new ArrayList<>(); + + while(type > 0){ //查找父级部门 + staffEntities = departmentsStaffRelateService.selectLeadersByDepartmentId(depId); + if(staffEntities.size() > 0){//如果中间部门没有领导,那么继续找 + type--; + } 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<>());