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

Merge pull request '花名册树，同级情况下，部门展示在分部前面' (#264) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/264
This commit is contained in:
dxfeng 2024-07-03 18:24:29 +08:00
parent c44a6784fd 6e6c66687b
commit b31ee6a16b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,16 +116,13 @@ public class SearchTreeUtil {
Set<String> leafIds = new HashSet<>(); Set<String> leafIds = new HashSet<>();
List<SearchTree> collect = treeList.stream().peek(e -> { List<SearchTree> collect = treeList.stream().peek(e -> {
Set<TreeNode> treeNodes = new LinkedHashSet<>(); Set<TreeNode> treeNodes = new LinkedHashSet<>();
List<TreeNode> nodes = parentMap.get(e.getId());
if (CollectionUtils.isNotEmpty(nodes)) {
treeNodes.addAll(nodes);
}
if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
treeNodes.addAll(searchTrees); treeNodes.addAll(searchTrees);
} }
if(CollectionUtils.isNotEmpty(treeNodes)){ List<TreeNode> nodes = parentMap.get(e.getId());
treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new)); if (CollectionUtils.isNotEmpty(nodes)) {
treeNodes.addAll(nodes);
} }
e.setSubs(new ArrayList<>(treeNodes)); e.setSubs(new ArrayList<>(treeNodes));
leafIds.add(e.getId()); leafIds.add(e.getId());