Merge remote-tracking branch 'origin/master'

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

@@ -620,7 +620,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));
 							}
 						}
@@ -630,7 +630,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				List<String> filePageUrlList = baseMapper.getFilePageUrlListByContract(projectId,contractId,treeCode);
 				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));
 						}
 					}
@@ -1861,6 +1861,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			strIds.add(ar.getId().toString());
 		}
 
+		if (strIds.size() == 0){
+			return false;
+		}
+
 		//更新
 		List<ArchiveFile> files = archiveFileClient.getAllArchiveFileByArchiveIds(strIds);
 		List<String> removeFiles = new ArrayList<>();