顺序修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java

@@ -198,7 +198,7 @@ public class NewSysOrgController extends SuperController {
                 queryWrapper.orderByDesc(param.getOrderBy());
             }
         } else {
-            queryWrapper.orderByAsc(new String[]{"parent_ids", "tree_sort"});
+            queryWrapper.orderByAsc(new String[]{"is_rent", "parent_ids", "tree_sort"});
         }
         if (param.getTreeLevel() != null) {
             queryWrapper.eq(SysOrg.TREE_LEVEL, param.getTreeLevel());
@@ -608,7 +608,11 @@ public class NewSysOrgController extends SuperController {
         // 找到所有子节点
         List<SysOrg> childOrgs = orgMap.values().stream()
                 .filter(org -> parentId.equals(org.getParentId()))
-                .sorted(Comparator.comparing(SysOrg::getIsDept).reversed()) // 按照IS_DEPT降序排序
+                .sorted(Comparator.comparing(SysOrg::getIsDept).reversed() // 按照IS_DEPT降序排序
+                        .thenComparingInt(org -> {
+                            String isRent = ((NewSysOrg) org).getIsRent();
+                            return isRent != null ? Integer.parseInt(isRent) : 0;
+                        }))
                 .collect(Collectors.toList());
 
         // 递归处理每个子节点

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysUserController.java

@@ -609,7 +609,11 @@ public class NewSysUserController extends SuperController {
         // 找到所有子节点
         List<SysOrg> childOrgs = orgMap.values().stream()
                 .filter(org -> parentId.equals(org.getParentId()))
-                .sorted(Comparator.comparing(SysOrg::getIsDept).reversed()) // 按照IS_DEPT降序排序
+                .sorted(Comparator.comparing(SysOrg::getIsDept).reversed() // 按照IS_DEPT降序排序
+                        .thenComparingInt(org -> {
+                            String isRent = ((NewSysOrg) org).getIsRent();
+                            return isRent != null ? Integer.parseInt(isRent) : 0;
+                        }))
                 .collect(Collectors.toList());
 
         if (!"1".equals(isSubordinates)) {

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/model/domian/NewSysOrg.java

@@ -18,6 +18,10 @@ public class NewSysOrg extends SysOrg {
     @TableField(exist = false)
     private String orgType;
 
+    @ApiModelProperty(value = "是否为租赁库 0否 1是")
+    @TableField("is_rent")
+    private String isRent;
+
     public static final String NATURE = "nature";
     public static final String IS_RENT = "is_rent";
 }

zlmy-modules/zlmy-boot/src/main/resources/application.yml

 
 spring:
   profiles:
-    active: prod
+    active: pre
   application:
     name: zlmy-boot
   servlet:

zlmy-modules/zlmy-boot/src/main/resources/license.dat

-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   o= 
+uc3Y29XJfVtZtZTbmFsrU2y4yb2CnB3RfplYtZTbmFsrU2y4pY2Cmx2VfVuc9MjaWQTYKQwMjZWbGlV905zZlPXeXBWFsRyayZWCmNV9kF0ZlPTYXRjYtIwMtMDMDgW5kMKZhdGX2RjAyU9MxMSNi0wpU0wMQcmV19WN09kdhbWX05G9uU9VlYgZ1d19WpUVzaWZXJ0519uXlcjbWJjAu03LQcmRQpWN09kdhbWX05G9uU9VlYgZ1dXJzpWZuX0aW9WJl51b3Ljcj0QpiAuRkaXaW5lRXA9CQVVX0N1VO9DT1MAVD019FpUV0aWZGlUVt9uPkCkYmV19W5FVTSURVJ0xJ9OXOQ0Q0VG1GU9TXdFRkp2hHlkU2diekEjdIthNhQmWCtHBPwyR4ODUGxzA1NYc6UUNXBjFVZJaXNXc210xHcwLKOVbkJndOkychVFQjdEYxBBTMakMVJHhjVBWNOGajJ1V14rbtMDVXpnlQRFc4MWRUtGxZNFTYaXUlhTU3NuWxaDOSsGkKZ1aXX1TkVlNJZFUfTET05U5DlDRSV3RT13hDNYTCSmU0ZldMo5V4NlRFpXlRF4R4WkTUgDc05vM6TGZnhHZZp1bEaTbmtWtqVRV3amLyt0RWJJamQ2Z3JnYy5ubNQ3TGJmNGUzdGTWWmNVVSNaWMeDMXRmtIVyYuajcUNXNTJ0eSVWN3B1pOY0cLNTbEtC9CFmVOUgdmlVdfpORSU0VkVl9MlPTFTkSUNURENFPWTWbUlkMy1yZzVmQlVGthxhdIemcUJmpIlCS1bWUTEWt3NaYWV0TjN3h2lxd3eXYS90VmlnQrZHMWojM1BHbNaHb21VYvM1ZqRXWkJkNtF4M3PTc2NkVX0KTFUlX1Z05fNJTDRUTElV9T5DR9YWVU4W5RF3VCTEeTJ0kzJqQzdmTWtGRr5YShbmcW1C9r9SR3emMVADdmdTTuSUajBHcxpmR6VWSG91Bxdjd3dkZ1cnJrNGQRVXTGR1JDZWYFWmTHNm1SJzcwTlbjElJjR0ZVT2bG5U5wRHUwM2VEMi85lXTTdXRlNEVPV4OBaVSkxkVXEKTFUlX1Z05fNJTDRUTElV9T5DR9dzVU4npXAvcyZWbHglhZVKQvTEdE1mJtxPQ5TTb1kklRFtdkOEcHBWlkh1bHWUaVNk9ix5ZoZDa2xkF1hHW2b2cFUXdto3ZzeEcllUo5xoNjMjSHlHZydRVNYjcGdVZIdzSyK1M092tUNCSlR2Nk5EJGtFdJMDWTRzRxh4T1eFYWVkVXcKTFUlX1Z05fNJTDRUTElV9T5DR9aUVU40FTRJMLbEYUZWFSg5WFSHaHFVBQJuMSbHcHNDZLdaZ2RyR2lUd19OYuMFOU9DZtpRaESEaWhTBs1EOKaUUnlUsrNHVFSVVkZDhCEzU1WFaE9kN5pid2VzMnknROlwTzT1c0lThiovVFM2bDVmFXYwRaeFZzZjdWd5Wrc2bEckVX8KTFUlX1Z05fNJTDRUTElV9T5DR9bnVU4HFylQe0UGM00mZrwyW3MGL1Qkd010YxUWUVhWF4gzO0ciUU5VNY83arUid0VVZu9pe1ZlbkRlJrg5QPakMkdmFs5wZGN0ck5Uor5hV5OFeGZExmJoeyVGbEp1E1hPawWTU3Fk9Id2dRMWR0VWRE9oOEY0Q0JkdltNZvelaXI   QK 
\ No newline at end of file