Merge branch 'zhifk0614'

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

@@ -469,7 +469,7 @@
         d.parent_id AS "parentId",
         IFNULL(if(length(trim(full_name)) > 0, full_name, node_name),node_name) AS title,
         d.node_name AS "nodeName",
-        d.node_type AS "nodeType",
+        d.node_type ,
         d.id AS "value",
         d.id AS "key",
         old_id,

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

@@ -400,6 +400,9 @@ public class ArTreeContractInitServiceImpl {
         for (WbsTreeContractVO6 wbsTreeVO2 : wbsTreeContractVO6s) {
             //不要中间交工，质量评定和开工报告作为目录节点
             //wbsMap.put(wbsTreeVO2.getId(),wbsTreeVO2);
+            if(wbsTreeVO2.getNodeType() == null){
+                continue;
+            }
             if (!wbsTreeVO2.isProcessType()) {
                 continue;
             }

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

@@ -157,7 +157,7 @@ public class ArchiveTreeContractSyncImpl {
 
         List<ArchiveTreeContract> saveList = new ArrayList<>();
         //todo 等测试OK再打开
-        //saveList =arTreeContractInitService.getContractExtNodes(AuthUtil.getTenantId(),projectId,dstTree);
+//        saveList =arTreeContractInitService.getContractExtNodes(AuthUtil.getTenantId(),projectId,dstTree);
 
         return saveList;
     }