|
|
@ -794,8 +794,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
|
|
|
|
|
|
|
Map<Integer, DepartmentPO> departmentPOMap = getDepartmentMapper().listAll("showorder").stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
|
|
|
|
Map<Integer, DepartmentPO> departmentPOMap = getDepartmentMapper().listAll("showorder").stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
|
|
|
|
if (departmentPO.getCanceled() == null || departmentPO.getCanceled() == 0) {
|
|
|
|
buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
|
|
|
|
buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
List<SearchTree> departmentList = DepartmentBO.buildSetToSearchTree(builderDeparts);
|
|
|
|
List<SearchTree> departmentList = DepartmentBO.buildSetToSearchTree(builderDeparts);
|
|
|
|
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(departmentList);
|
|
|
|
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(departmentList);
|
|
|
|
List<SearchTree> searchTrees = SearchTreeUtil.builderTreeMode(departmentList, jobTrees);
|
|
|
|
List<SearchTree> searchTrees = SearchTreeUtil.builderTreeMode(departmentList, jobTrees);
|
|
|
@ -844,8 +846,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
// 查询分部信息
|
|
|
|
// 查询分部信息
|
|
|
|
Set<DepartmentPO> builderDeparts = new HashSet<>();
|
|
|
|
Set<DepartmentPO> builderDeparts = new HashSet<>();
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
|
|
|
|
if (departmentPO.getCanceled() == null || departmentPO.getCanceled() == 0) {
|
|
|
|
buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
|
|
|
|
buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts), jobTrees);
|
|
|
|
return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts), jobTrees);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|