liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

花名册树BUG

This commit is contained in:
dxfeng 2022-10-25 11:09:14 +08:00
parent 594173175c
commit a36648ea39
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -576,7 +576,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
for (DepartmentPO departmentPO : filterDeparts) {
buildParentDepts(departmentPO, builderDeparts);
}
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts, false));
List<SearchTree> departmentTrees = DepartmentBO.buildSetToSearchTree(builderDeparts, false);
List<SearchTree> searchTrees = SearchTreeUtil.builderTreeMode(departmentTrees, jobTrees);
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(departmentTrees);
// 添加部门的上级分部
String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(","));
if (!StringUtil.isEmpty(parentCompS)) {
@ -589,7 +591,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
for (CompPO compPO : filterComps) {
buildParentComps(compPO, builderComps);
}
List<SearchTree> searchTrees = SearchTreeUtil.builderTreeMode(deptTrees, jobTrees);
return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps), searchTrees);
}

4
src/com/engine/organization/util/tree/SearchTreeUtil.java
View File

@ -108,7 +108,7 @@ public class SearchTreeUtil {
Map<String, List<SearchTree>> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp));
boolean isAdd = !childMap.isEmpty();
return treeList.stream().peek(e -> {
List<TreeNode> treeNodes = new ArrayList<>();
Set<TreeNode> treeNodes = new HashSet<>();
List<TreeNode> nodes = parentMap.get(e.getId());
if (CollectionUtils.isNotEmpty(nodes)) {
treeNodes.addAll(nodes);
@ -119,7 +119,7 @@ public class SearchTreeUtil {
if (CollectionUtils.isNotEmpty(e.getSubs())) {
treeNodes.addAll(e.getSubs());
}
e.setSubs(treeNodes);
e.setSubs( new ArrayList<>(treeNodes));
}).peek(item -> {
if (CollectionUtils.isNotEmpty(item.getSubs())) {
item.setIsParent(true);