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

花名册树，同级情况下，部门展示在分部前面

This commit is contained in:
dxfeng 2024-07-03 10:09:13 +08:00
parent f928ea04d5
commit 37f0361d92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,8 +124,8 @@ public class SearchTreeUtil {
List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
treeNodes.addAll(searchTrees);
}
if (CollectionUtils.isNotEmpty(e.getSubs())) {
treeNodes.addAll(e.getSubs());
if(CollectionUtils.isNotEmpty(treeNodes)){
treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new));
}
e.setSubs(new ArrayList<>(treeNodes));
leafIds.add(e.getId());