diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index b1065faa..60b7ce31 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -116,16 +116,13 @@ public class SearchTreeUtil { Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { Set treeNodes = new LinkedHashSet<>(); - List nodes = parentMap.get(e.getId()); - if (CollectionUtils.isNotEmpty(nodes)) { - treeNodes.addAll(nodes); - } if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); treeNodes.addAll(searchTrees); } - if(CollectionUtils.isNotEmpty(treeNodes)){ - treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new)); + List nodes = parentMap.get(e.getId()); + if (CollectionUtils.isNotEmpty(nodes)) { + treeNodes.addAll(nodes); } e.setSubs(new ArrayList<>(treeNodes)); leafIds.add(e.getId());