自动组卷增加保护

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

@@ -562,7 +562,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				for(String outUrl:archivesOutUrlList){
 					String[] splits = outUrl.split(",");
 					for(String url:splits){
-						if(StringUtils.isNotEmpty(url.trim())){
+						if(StringUtils.isNotEmpty(url) && StringUtils.isNotEmpty(url.trim())){
 							removeFiles.add(FileUtils.getAliYunSubUrl(url));
 						}
 					}
@@ -572,7 +572,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			List<String> filePageUrlList = baseMapper.getFilePageUrlList(projectId);
 			if(filePageUrlList!=null && filePageUrlList.size()>0){
 				for(String url:filePageUrlList){
-					if(StringUtils.isNotEmpty(url.trim())){
+					if(StringUtils.isNotEmpty(url) && StringUtils.isNotEmpty(url.trim())){
 						removeFiles.add(FileUtils.getAliYunSubUrl(url));
 					}
 				}
@@ -602,7 +602,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					for(String outUrl:archivesOutUrlList){
 						String[] splits = outUrl.split(",");
 						for(String url:splits){
-							if(StringUtils.isNotEmpty(url.trim())){
+							if(StringUtils.isNotEmpty(url) && StringUtils.isNotEmpty(url.trim())){
 								removeFiles.add(FileUtils.getAliYunSubUrl(url));
 							}
 						}
@@ -612,7 +612,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				List<String> filePageUrlList = baseMapper.getFilePageUrlListByNode(projectId,ancestors,strNodeId);
 				if(filePageUrlList!=null && filePageUrlList.size()>0){
 					for(String url:filePageUrlList){
-						if(StringUtils.isNotEmpty(url.trim())){
+						if(StringUtils.isNotEmpty(url) && StringUtils.isNotEmpty(url.trim())){
 							removeFiles.add(FileUtils.getAliYunSubUrl(url));
 						}
 					}
@@ -2138,9 +2138,12 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				log.info("[自动组卷]{}","自动组卷完成。projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 			}catch (Exception e){
 				e.printStackTrace();
-				log.error("自动组卷报错。"+e.getMessage()+"--projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+				log.error("[自动组卷] 报错。"+e.getMessage()+"--projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 				//设置自动组卷结束
 				contractClient.updateIsArchivesAutoById(contractId, 0);
+			}finally {
+				contractClient.updateIsArchivesAutoById(contractId, 0);
+				log.error("[自动组卷] 流程结束--projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 			}
 		});
 	}