表单排序

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java

@@ -279,4 +279,7 @@ public class WbsTreeContract extends BaseEntity {
     @ApiModelProperty(value = "是否为自定义新增节点 1=是")
     private Integer isCustom;
 
+    @ApiModelProperty(value = "是否采用排序0否1是")
+    private Integer isUseSort;
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -455,7 +455,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         }
 
         WbsTreeContract wbsTreeContract = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
-                .select(WbsTreeContract::getId, WbsTreeContract::getProjectId, WbsTreeContract::getContractId, WbsTreeContract::getContractIdRelation, WbsTreeContract::getWbsId)
                 .eq(WbsTreeContract::getPKeyId, primaryKeyId));
         if (wbsTreeContract == null) {
             return Collections.emptyList();
@@ -536,11 +535,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 resultTabs = new ArrayList<>();
             }
         }
-
-        //表单排序
-        if (resultTabs.size() > 0) {
-            List<AppWbsTreeContractVO> resultTabsToCopy = this.sortTabs(resultTabs, "__"); //复制表排序
-            return this.sortTabs(resultTabsToCopy, "_PL_"); //频率表排序
+        if (wbsTreeContract.getIsUseSort() == 0) {
+            //表单排序
+            if (resultTabs.size() > 0) {
+                List<AppWbsTreeContractVO> resultTabsToCopy = this.sortTabs(resultTabs, "__"); //复制表排序
+                return this.sortTabs(resultTabsToCopy, "_PL_"); //频率表排序
+            }
         }
         return resultTabs;
     }
@@ -2365,6 +2365,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 map.put(id,sort++);
             }
             baseMapper.tableSort(map);
+            this.update(new LambdaUpdateWrapper<WbsTreeContract>()
+                    .eq(WbsTreeContract::getPKeyId,dto.getNodeIds())
+                    .set(WbsTreeContract::getIsUseSort,1));
         }else {
             throw new ServiceException("请传入ids");
         }