Merge remote-tracking branch 'origin/master'

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);
@@ -572,7 +572,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(StringUtils.isEmpty(storageTime)){
 			//节点没有值，就从合同段获取，没有合同段id的 用业主的合同段
 			Long nodeContractId = archivesAuto.getContractId();
-			if(nodeContractId!=null){
+			if(nodeContractId!=null && nodeContractId!=-1){
 				if(nodeContract==null){
 					nodeContract = contractClient.getContractById(nodeContractId);
 				}
@@ -597,11 +597,15 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(StringUtils.isEmpty(secretLevel)){
 			//节点没有值，就从合同段获取，没有合同段id的 用业主的合同段
 			Long nodeContractId = archivesAuto.getContractId();
-			if(nodeContractId!=null){
+			if(nodeContractId!=null && nodeContractId!=-1){
 				if(nodeContract==null){
 					nodeContract = contractClient.getContractById(nodeContractId);
 				}
-				secretLevel = nodeContract.getSecurityLevel().toString();
+				if(nodeContract.getSecurityLevel()==null){
+					secretLevel="4";
+				}else{
+					secretLevel = nodeContract.getSecurityLevel().toString();
+				}
 			}else{
 				List<Long> pids= new ArrayList<>();
 				pids.add(archivesAuto.getProjectId());
@@ -610,7 +614,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				}
 				for(ContractInfo c:contracts){
 					if(c.getContractType()==3){
-						secretLevel = c.getSecurityLevel().toString();
+						if(nodeContract.getSecurityLevel()==null){
+							secretLevel="4";
+						}else{
+							secretLevel = c.getSecurityLevel().toString();
+						}
 					}
 				}
 			}
@@ -622,7 +630,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(StringUtils.isEmpty(rollor)){
 			//节点没有值，就从合同段获取，没有合同段id的 用业主的合同段
 			Long nodeContractId = archivesAuto.getContractId();
-			if(nodeContractId!=null){
+			if(nodeContractId!=null && nodeContractId!=-1){
 				if(nodeContract==null){
 					nodeContract = contractClient.getContractById(nodeContractId);
 				}
@@ -647,7 +655,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		if(StringUtils.isEmpty(reviewer)){
 			//节点没有值，就从合同段获取，没有合同段id的 用业主的合同段
 			Long nodeContractId = archivesAuto.getContractId();
-			if(nodeContractId!=null){
+			if(nodeContractId!=null && nodeContractId!=-1){
 				if(nodeContract==null){
 					nodeContract = contractClient.getContractById(nodeContractId);
 				}