修改找领导逻辑,如果部门没有领导那么直接找上一级的

This commit is contained in:
wulin 2020-12-18 17:01:32 +08:00
parent bf00409bd9
commit 95a1e2c9c9

View File

@ -478,22 +478,27 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
type++; type++;
} }
String depId = departmentsStaffRelateEntity.getDepartmentId(); String depId = departmentsStaffRelateEntity.getDepartmentId();
departManagers.setDepartmentId(depId); departManagers.setDepartmentId(depId);//设置返回的部门id
List<StaffEntity> staffEntities = null;
while(type > 1){ while(type > 1){
//查找父级部门 //查找父级部门
DepartmentsEntity departmentsEntity = DepartmentsEntity departmentsEntity =
departmentsService.selectParentDepartmentByDepartmentId(depId); departmentsService.selectParentDepartmentByDepartmentId(depId);
if(departmentsEntity != null){ if(departmentsEntity != null){
depId = departmentsEntity.getDepartmentId(); depId = departmentsEntity.getDepartmentId();
staffEntities = departmentsStaffRelateService.selectLeadersByDepartmentId(depId);
if(staffEntities.size() > 0){
type--;
}
}else{ }else{
log.info("没有找到父级部门部门id{}", depId); log.info("没有找到父级部门部门id{}", depId);
departManagers.setManagers(new ArrayList<>()); departManagers.setManagers(new ArrayList<>());
return departManagers; return departManagers;
} }
type--;
} }
List<StaffEntity> staffEntities = /*List<StaffEntity> staffEntities =
departmentsStaffRelateService.selectLeadersByDepartmentId(depId); departmentsStaffRelateService.selectLeadersByDepartmentId(depId);*/
departManagers.setManagers(staffEntities); departManagers.setManagers(staffEntities);
if(staffEntities.size() == 0){ if(staffEntities.size() == 0){
log.info("无法找到管理人员.部门id{}", depId); log.info("无法找到管理人员.部门id{}", depId);