左侧树排序

src/com/engine/organization/entity/company/bo/CompBO.java

@@ -103,7 +103,7 @@ public class CompBO {
     }
 
     public static List<SearchTree> buildSetToSearchTree(Set<CompPO> comps) {
-        return comps.stream().map(item -> {
+        return comps.stream().sorted(Comparator.comparing(CompPO::getShowOrder)).map(item -> {
             SearchTree tree = new SearchTree();
             tree.setCanClick(true);
             tree.setCanceled(item.getForbiddenTag() != 0);
@@ -115,6 +115,7 @@ public class CompBO {
             tree.setPid(null == item.getParentCompany() ? "0" : item.getParentCompany().toString());
             tree.setSelected(false);
             tree.setType("1");
+            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -140,6 +140,7 @@ public class DepartmentBO {
             tree.setSelected(false);
             tree.setType("2");
             tree.setParentComp(null == item.getParentComp() ? "0" : item.getParentComp().toString());
+            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -167,6 +167,7 @@ public class JobBO {
             tree.setSelected(false);
             tree.setType("3");
             tree.setParentComp(null == item.getParentDept() ? "0" : item.getParentDept().toString());
+            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
             return tree;
         }).collect(Collectors.toList());
 

src/com/engine/organization/entity/searchtree/SearchTree.java

@@ -18,4 +18,5 @@ public class SearchTree extends TreeNode {
     private boolean isCanceled;
     private String requestParams;
     private String parentComp;
+    private Integer orderNum;
 }

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -705,7 +705,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     private List<SearchTree> getFilterCompany(String id, String keyword) {
         // 查询部门信息
         Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id);
-        CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build();
+        CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).forbiddenTag(0).build();
         List<CompPO> filterComps = getCompMapper().listByFilter(compBuild, "show_order");
 
         Set<CompPO> builderComps = new HashSet<>();
@@ -728,7 +728,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             return;
         }
         CompPO parentComp = getCompMapper().listById(compPO.getParentCompany());
-        if (null != parentComp) {
+        if (null != parentComp && 0 == parentComp.getForbiddenTag()) {
             buildParentComps(parentComp, builderComps);
         }
     }

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -497,7 +497,7 @@ public class JobServiceImpl extends Service implements JobService {
             return;
         }
         DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getParentDept());
-        if (null != parentDept) {
+        if (null != parentDept && 0 == parentDept.getForbiddenTag()) {
             buildParentDepts(parentDept, builderDeparts);
         }
     }
@@ -514,7 +514,7 @@ public class JobServiceImpl extends Service implements JobService {
             return;
         }
         CompPO parentComp = getCompMapper().listById(compPO.getParentCompany());
-        if (null != parentComp) {
+        if (null != parentComp && 0 == parentComp.getForbiddenTag()) {
             buildParentComps(parentComp, builderComps);
         }
     }
@@ -532,13 +532,13 @@ public class JobServiceImpl extends Service implements JobService {
         // 通过分部、公司 组装数据
         if (StringUtil.isEmpty(id) || TYPE_COMP.equals(type)) {
             Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id);
-            DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentComp(parentCompId).build();
+            DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentComp(parentCompId).forbiddenTag(0).build();
-            CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build();
+            CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).forbiddenTag(0).build();
             searchTree = buildTreeByCompAndDept(departmentBuild, compBuild);
         } else if (TYPE_DEPT.equals(type)) {
             //
             // 查询部门信息
-            List<DepartmentPO> filterDeparts = getDepartmentMapper().listByFilter(DepartmentPO.builder().deptName(keyword).parentDept(Long.parseLong(id)).build(), "show_order");
+            List<DepartmentPO> filterDeparts = getDepartmentMapper().listByFilter(DepartmentPO.builder().deptName(keyword).forbiddenTag(0).parentDept(Long.parseLong(id)).build(), "show_order");
             Set<DepartmentPO> builderDeparts = new HashSet<>();
             for (DepartmentPO departmentPO : filterDeparts) {
                 buildParentDepts(departmentPO, builderDeparts);

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

@@ -88,8 +88,9 @@ public class SearchTreeUtil {
      * @return
      */
     public static List<SearchTree> builderTreeMode(List<SearchTree> treeList) {
-        Map<String, List<TreeNode>> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
+        List<SearchTree> sortedList = treeList.stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
-        return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> {
+        Map<String, List<TreeNode>> collects = sortedList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
+        return sortedList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> {
             if (CollectionUtils.isNotEmpty(item.getSubs())) {
                 item.setIsParent(true);
             }