Merge remote-tracking branch 'origin/test-merge' into test-merge

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

@@ -463,6 +463,13 @@ public class ArTreeContractInitServiceImpl {
 
             //排除已经有的
             if (extMap.get(wbsTreeVO2.getId()) != null) {
+                //上传节点
+                if (wbsTreeVO2.getNodeType() != null && wbsTreeVO2.getNodeType().longValue() == level) {
+                    ArchiveTreeContractVO2 contractVO2 = extMap.get(wbsTreeVO2.getId());
+                    contractVO2.setIsStorageNode(1);
+                    contractVO2.setStorageType(subTree.getStorageType());
+                    contractVO2.setFlag(1);
+                }
                 continue;
             }
 
@@ -543,6 +550,7 @@ public class ArTreeContractInitServiceImpl {
             //上传节点
             if (wbsTreeVO2.getNodeType() != null && wbsTreeVO2.getNodeType().longValue() == level) {
                 archiveTree.setIsStorageNode(1);
+                archiveTree.setStorageType(subTree.getStorageType());
             }
             archiveTreeContracts.add(archiveTree);