档案-并卷-案卷提名

1、组合文件提名的时候修改组装逻辑，去掉最后一个顿号

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

@@ -5644,7 +5644,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			Map<Long, String> map = archiveTreeContractListByList.stream().collect(Collectors.toMap(ArchiveTreeContract::getId, ArchiveTreeContract::getArchiveNameSuffix));
 			if(CollectionUtils.isNotEmpty(archiveTreeContractListByList)){
 				ArchiveTreeContract archiveTreeContract = archiveTreeContractListByList.get(0);
-				suffix = archiveTreeContract.getArchiveNameSuffix();
+				if(StringUtils.isNotEmpty(archiveTreeContract.getArchiveNameSuffix())){
+					suffix = "、" + archiveTreeContract.getArchiveNameSuffix();
+				}
 			}
 			List<String> strings = new ArrayList<>();
 			archivesAutos.forEach(f->{
@@ -5663,7 +5665,16 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			List<String> distinctList = strings.stream()
 					.distinct()
 					.collect(Collectors.toList());
-			sb.append(StringUtils.join(distinctList,"、")).append(suffix);
+
+			List<String> resultList = distinctList.stream()
+					.map(str -> {
+						if (str != null && str.endsWith("、")) {
+							return str.substring(0, str.length() - 1);
+						}
+						return str;
+					})
+					.collect(Collectors.toList());
+			sb.append(StringUtils.join(resultList,"、")).append(suffix);
 		}
 		return sb.toString();
 	}