组织管理，部门封存传参，树结构优化

src/com/engine/organization/entity/chart/TreeSelect.java

@@ -41,24 +41,24 @@ public class TreeSelect {
         children = new ArrayList<>();
         RecordSet rs = new RecordSet();
         if (COMPANY.equals(type)) {
-            String sql = "select id ,subcompanyname ,canceled from hrmsubcompany where " + getCancelSqlStr() + " and (supsubcomid is null or supsubcomid = 0) and companyid = ? order by showorder desc";
+            String sql = "select id ,subcompanyname ,canceled from hrmsubcompany where " + getCancelSqlStr() + " and (supsubcomid is null or supsubcomid = 0) and companyid = ? order by showorder";
             rs.executeQuery(sql, key);
             while (rs.next()) {
                 children.add(TreeSelect.builder().key(rs.getString("id")).title(rs.getString("subcompanyname")).canceled(rs.getString("canceled")).type(SUB_COMPANY).cancelSql(cancelSql).build());
             }
         } else if (SUB_COMPANY.equals(type)) {
-            String sql = "select id ,subcompanyname ,canceled from hrmsubcompany where " + getCancelSqlStr() + " and supsubcomid = ? order by showorder desc";
+            String sql = "select id ,subcompanyname ,canceled from hrmsubcompany where " + getCancelSqlStr() + " and supsubcomid = ? order by showorder";
             rs.executeQuery(sql, key);
             while (rs.next()) {
                 children.add(TreeSelect.builder().key(rs.getString("id")).title(rs.getString("subcompanyname")).canceled(rs.getString("canceled")).type(SUB_COMPANY).cancelSql(cancelSql).build());
             }
-            sql = "select id,departmentname ,canceled from hrmdepartment where " + getCancelSqlStr() + " and (supdepid is null or supdepid =0) and subcompanyid1 = ? order by showorder desc";
+            sql = "select id,departmentname ,canceled from hrmdepartment where " + getCancelSqlStr() + " and (supdepid is null or supdepid =0) and subcompanyid1 = ? order by showorder";
             rs.executeQuery(sql, key);
             while (rs.next()) {
                 children.add(TreeSelect.builder().key(rs.getString("id")).title(rs.getString("departmentname")).canceled(rs.getString("canceled")).type(DEPARTMENT).cancelSql(cancelSql).build());
             }
         } else if (DEPARTMENT.equals(type)) {
-            String sql = "select id,departmentname ,canceled from hrmdepartment where " + getCancelSqlStr() + " and supdepid  = ? order by showorder desc";
+            String sql = "select id,departmentname ,canceled from hrmdepartment where " + getCancelSqlStr() + " and supdepid  = ? order by showorder";
             rs.executeQuery(sql, key);
             while (rs.next()) {
                 children.add(TreeSelect.builder().key(rs.getString("id")).title(rs.getString("departmentname")).canceled(rs.getString("canceled")).type(DEPARTMENT).cancelSql(cancelSql).build());

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

@@ -61,7 +61,7 @@ public class CompBO {
                 .companyId(null == param.getCompanyId() ? 1 : param.getCompanyId())
                 .supSubComId(param.getSupSubComId())
                 .url(param.getUrl())
-                .canceled(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
+                .canceled(param.getCanceled() == null ? null : param.getCanceled() ? 0 : 1)
                 .subCompanyCode(param.getSubCompanyCode())
                 .outKey(param.getOutKey())
                 .limitUsers(null == param.getLimitUsers() ? 0 : param.getLimitUsers())

src/com/engine/organization/entity/company/param/CompParam.java

@@ -20,7 +20,7 @@ public class CompParam extends BaseQueryParam {
     private Integer companyId;
     private Integer supSubComId;
     private String url;
-    private Boolean forbiddenTag;
+    private Boolean canceled;
     private String subCompanyCode;
     private String outKey;
     private Integer limitUsers;

src/com/engine/organization/entity/department/param/DeptSearchParam.java

@@ -29,5 +29,4 @@ public class DeptSearchParam extends BaseQueryParam {
     private String uuid;
     private Double showOrder;
     private Integer showOrderOfTree;
-    private Boolean forbiddenTag;
 }

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

@@ -477,14 +477,14 @@ public class ChartServiceImpl extends Service implements ChartService {
     public Map<String, Object> getMovingTree(Map<String, Object> params) {
         RecordSet rs = new RecordSet();
         String canceled = Util.null2String(params.get("canceled"));
-        rs.executeQuery("select id,subcompanyname,canceled from hrmsubcompany where (canceled is null or canceled != 1) and (supsubcomid is null or supsubcomid = 0)");
+        rs.executeQuery("select id,subcompanyname,canceled from hrmsubcompany where (canceled is null or canceled != 1) and (supsubcomid is null or supsubcomid = 0) order by showorder");
         List<TreeSelect> movingTrees = new ArrayList<>();
         while(rs.next()){
             movingTrees.add(TreeSelect.builder().key(rs.getString("id")).title(rs.getString("subcompanyname")).type(TreeSelect.SUB_COMPANY).cancelSql(canceled).build());
         }
         Map<String, Object> result = new HashMap<>(3);
         result.put("movingTree", movingTrees);
-        result.put("expandedKeys", movingTrees.stream().map(TreeSelect::getKey).collect(Collectors.toList()));
+        result.put("expandedKeys", movingTrees.stream().filter(item -> CollectionUtils.isNotEmpty(item.getChildren())).map(TreeSelect::getKey).collect(Collectors.toList()));
         result.put("api_status", true);
         return result;
     }
@@ -498,7 +498,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         String canceled = Util.null2String(params.get("canceled"));
         if(rs.next()){
             companyTree = TreeSelect.builder().key(rs.getString("id")).title(rs.getString("companyname")).type(TreeSelect.COMPANY).cancelSql(canceled).build();
-            expandedKeys = companyTree.getChildren().stream().map(TreeSelect::getKey).collect(Collectors.toList());
+            expandedKeys = companyTree.getChildren().stream().filter(item -> CollectionUtils.isNotEmpty(item.getChildren())).map(TreeSelect::getKey).collect(Collectors.toList());
             expandedKeys.add(companyTree.getKey());
         }
 

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

@@ -123,7 +123,7 @@ public class CompServiceImpl extends Service implements CompService {
     @Override
     public int updateForbiddenTagById(CompParam params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        CompPO compPO = CompPO.builder().id(params.getId()).canceled(params.getForbiddenTag() ? 0 : 1).build();
+        CompPO compPO = CompPO.builder().id(params.getId()).canceled(params.getCanceled() ? 0 : 1).build();
         Map<String, Object> map = new HashMap<>();
         map.put("id", compPO.getId().toString());
         map.put("forbiddenTag", compPO.getCanceled());

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

@@ -182,7 +182,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     @Override
     public int updateForbiddenTagById(DeptSearchParam params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        DepartmentPO departmentPO = DepartmentPO.builder().id(params.getId()).canceled(params.getForbiddenTag() ? 0 : 1).build();
+        DepartmentPO departmentPO = DepartmentPO.builder().id(params.getId()).canceled(params.getCanceled() ? 0 : 1).build();
         Map<String, Object> map = new HashMap<>();
         map.put("id", Util.null2String(departmentPO.getId()));
         map.put("forbiddenTag", Util.null2String(departmentPO.getCanceled()));