Merge branch 'lk20230525'

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -281,10 +281,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					}
 				}
 			}
-			/*executorService.execute(()->{
+			executorService.execute(()->{
 				iossClient.removeFiles(removeFiles);
 				log.debug("文件删完了");
-			});*/
+			});
 
 			//取消未锁定案卷文件关联
 			baseMapper.splitArchvies(projectId);
@@ -318,10 +318,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 						}
 					}
 				}
-				/*executorService.execute(()->{
+				executorService.execute(()->{
 					iossClient.removeFiles(removeFiles);
 					log.debug("文件删完了");
-				});*/
+				});
 
 				baseMapper.splitArchviesByNode(projectId,ancestors,strNodeId);
 			}else{
@@ -347,10 +347,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 						}
 					}
 				}
-				/*executorService.execute(()->{
+				executorService.execute(()->{
 					iossClient.removeFiles(removeFiles);
 					log.debug("文件删完了");
-				});*/
+				});
 
 				//没节点的按合同段
 				baseMapper.splitArchviesByContract(projectId,contractId,treeCode);
@@ -1573,7 +1573,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		String treeCode = getAuthCode(contractId);
 		String strNodeId = "";
 		if (nodeId!= null) {
+			ArchiveTreeContract node = archiveTreeContractClient.getArchiveTreeContractById(nodeId);
 			strNodeId  = nodeId.toString();
+			if(node.getContractId()==null || node.getContractId()==-1){
+				treeCode="";
+			}
 		}
 
 		return archiveTreeContractFilter(archiveTreeContracts, treeCode, strNodeId,contractId);