|
@@ -380,14 +380,17 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|
|
.eq("company_id", user.getCompanyId()));
|
|
|
ArrayList<Department> departmentList = new ArrayList<>();
|
|
|
//查找出员工所在顶层部门
|
|
|
- while (true){
|
|
|
- if (userDept.getSuperiorId()==null){
|
|
|
- break;
|
|
|
- }else {
|
|
|
- for (Department supDept : allDepartmentList) {
|
|
|
- if (supDept.getDepartmentId().equals(userDept.getSuperiorId())){
|
|
|
- userDept = supDept;
|
|
|
- departmentList.add(supDept);
|
|
|
+ if (userDept!=null){
|
|
|
+ departmentList.add(userDept);
|
|
|
+ while (true){
|
|
|
+ if (userDept.getSuperiorId()==null){
|
|
|
+ break;
|
|
|
+ }else {
|
|
|
+ for (Department supDept : allDepartmentList) {
|
|
|
+ if (supDept.getDepartmentId().equals(userDept.getSuperiorId())){
|
|
|
+ userDept = supDept;
|
|
|
+ departmentList.add(supDept);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|