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

@@ -85,9 +85,13 @@ public class ArchiveTreeContractSyncImpl {
         ArchiveTreeContractVO2 dstTree = ForestNodeMergerEx.getSubTree(dstTrees, dstNodeId);
         List<ArchiveTreeContractVO2> addDst = new ArrayList<>();
 
+        if (srcTree == null) {
+            return saveList;
+        };
         ForestNodeMergerEx.syncTreeList(srcTree, dstTree, addDst);
 
 
+
         List<ArchiveTreeContractVO2> archiveTreeContractVO2s = new ArrayList<>();
         //取出指定范围
 
@@ -131,6 +135,9 @@ public class ArchiveTreeContractSyncImpl {
         Long srcNodeId = dstTree.getFromId();
         Long newNodeId = dstTree.getId();
         ArchiveTreeVO2 subTree = ForestNodeMergerEx.getSubTree(srcTree, srcNodeId);
+        if (subTree == null) {
+            return saveList;
+        }
 
         arTreeContractInitService.copyContractTree(dstNode.getTenantId(), dstNode.getProjectId()
                     , contractInfo, newNodeId, subTree.getChildren(), saveList, null);