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

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -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());