客户级归档树编辑组卷规则

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

@@ -973,12 +973,18 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//找出文件集合中的最大最小时间
 		List<String> fileTimeList = new ArrayList<>();
 		for(ArchiveFile file:waitArchiveFiles){
-			fileTimeList.add(file.getFileTime());
+			if(StringUtils.isNotEmpty(file.getFileTime())){
+				fileTimeList.add(file.getFileTime());
+			}
+		}
+		if(fileTimeList.size()>0){
+			Collections.sort(fileTimeList);
+			String startDate=fileTimeList.get(0);
+			String endDate=fileTimeList.get(fileTimeList.size()-1);
+			return startDate+","+endDate;
+		}else{
+			return "";
 		}
-		Collections.sort(fileTimeList);
-		String startDate=fileTimeList.get(0);
-		String endDate=fileTimeList.get(fileTimeList.size()-1);
-		return startDate+","+endDate;
 	}
 
 	private String builtArchiveName(List<ArchiveFile> waitArchiveFiles, ArchiveTreeContract node,boolean isCrossNode){

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

@@ -272,7 +272,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 
 		ArchiveTreeContract parent = null;
 		for (ArchiveTreeContractDTO archiveTreeSortDTO : listSort) {
-			if (archiveTreeSortDTO.getSort() != sortNumber) {
+			if (archiveTreeSortDTO.getSort()==null || archiveTreeSortDTO.getSort() != sortNumber) {
 				ArchiveTreeContract archiveTreeContract = getById(archiveTreeSortDTO.getId());
 				if (archiveTreeContract!= null ) {
 					archiveTreeContract.setSort(sortNumber);