暂时关闭组卷规则项目级同步客户级，搜0625

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

@@ -372,10 +372,11 @@ public class ArchiveTreeContract extends BaseEntity {
         this.projectType = archiveTree.getProjectType();
         this.storageType = archiveTree.getStorageType();
         this.expDataType = archiveTree.getExpDataType();
-        this.archiveAutoType = archiveTree.getArchiveAutoType();
-        this.archiveAutoNodeId = archiveTree.getArchiveAutoNodeId();
-        this.archiveAutoGroupId = archiveTree.getArchiveAutoGroupId();
-        this.archiveAutoGroupSelect = archiveTree.getArchiveAutoGroupSelect();
+        //TODO 0625
+//        this.archiveAutoType = archiveTree.getArchiveAutoType();
+//        this.archiveAutoNodeId = archiveTree.getArchiveAutoNodeId();
+//        this.archiveAutoGroupId = archiveTree.getArchiveAutoGroupId();
+//        this.archiveAutoGroupSelect = archiveTree.getArchiveAutoGroupSelect();
         this.isUploadFileDisplayConfigurationTree = archiveTree.getIsDisplayTree();
         this.classify = archiveTree.getClassify();
         this.treeSort =  archiveTree.getTreeSort();

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -398,7 +398,8 @@ public class ArchiveTreeContractController extends BladeController {
 
         //TODO 待节点都同步完了以后，再去设置wbs节点的组卷规则。（方式：客户级wbs节点-》项目级wbs节点-》wbs项目级组卷规则-》设置规则到客户级wbs节点以及子节点）
         if (b) {
-            archiveTreeContractService.updateWbsRuleNodes(archiveTree.getProjectId());
+            //todo 0625 暂时去掉项目级组卷规则同步客户级
+            //archiveTreeContractService.updateWbsRuleNodes(archiveTree.getProjectId());
         }
 
         if (b) {

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

@@ -235,7 +235,8 @@ public class ArTreeContractInitServiceImpl {
 
         InitTreeSort(trees.get(0), "", 0);
 
-        archiveAutoRuleSync.syncArchiveTreeContractList(vo2Map, proVo2Trees);
+        //todo 0625 暂时去掉项目级组卷规则同步客户级
+        //archiveAutoRuleSync.syncArchiveTreeContractList(vo2Map, proVo2Trees);
 
         List<ArchiveTreeContract> upList = new ArrayList<>();
 

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

@@ -200,10 +200,10 @@ public class ArchiveTreeContractSyncImpl {
         //排序
         ForestNodeMergerEx.InitAncestors(tree, "0");
 
-        ForestNodeMergerEx.InitTreeSort(tree, "", 0);
+        ForestNodeMergerEx.InitTreeSortEx(tree, "", 0);
 
-        //更新自动组卷节点
-        archiveAutoRuleSync.syncArchiveTreeContractList(vo2Map, proVo2Trees);
+        //更新自动组卷节点 todo 0625 暂时去掉项目级组卷规则同步客户级
+        //archiveAutoRuleSync.syncArchiveTreeContractList(vo2Map, proVo2Trees);
 
         //根据vo的排序和自动组卷信息，刷新新增节点，根据修改标识生成更新节点
         arTreeContractInitService.handleAddAndUpList(vo2Map, allAddList, upList);