项目、合同段WBS树保存相关

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeMapper.xml

@@ -120,6 +120,7 @@
             /*根节点=0 关联电子原生文件=1 数字化上传文件=2*/
             AND node_type in (0,#{nodeType})
         </if>
+        OR parent_id = 0
         ORDER BY sort
     </select>
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -99,6 +99,10 @@
         <foreach item="ids" collection="ids" open="(" close=")" separator=",">
             #{ids}
         </foreach>
+        OR parent_id IN
+        <foreach item="ids" collection="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
         AND wbs_id = #{wbsId}
         AND project_id = #{projectId}
         AND contract_id = #{contractId}

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

@@ -74,8 +74,20 @@ public class WbsTreeContractServiceImpl
 
         }
 
+
         List<String> diffRent = getDiffrent(idList1, collect7);
 
+        List<String> diffRentAll = getDiffrent(idList1, collect1);
+
+        System.out.println("list: " + list);
+        System.out.println("idList1: " + idList1);
+        System.out.println("col1: " + collect1);
+        System.out.println("col3: " + collect3);
+        System.out.println("col7: " + collect7);
+        System.out.println("diffRent: " + diffRent);
+        System.out.println("diffRentAll: " + diffRentAll);
+
+
         //同步元素表
         if (diffRent.size() == 0) {
             //获取私有wbs树下所有元素表
@@ -110,7 +122,7 @@ public class WbsTreeContractServiceImpl
         } else {
             //新增
 
-            if (idList1.size() > collect1.size()) {
+            if (idList1.size() > collect7.size()) {
                 List<WbsTreeContract> wbsTreeContractList = new ArrayList<>();
 
                 List<List<WbsTreePrivate>> wbsTreePrivatesList = new ArrayList<>();