档案并卷后pdf顺序混乱

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -656,14 +656,20 @@ public class ArchivesAutoController extends BladeController {
 		//根据档号后缀排序 拿到第一个
 		ArchivesAuto auto = archivesAutoList.get(0);
 		//查出所有案卷文件
-		List<ArchiveFile>archiveFileList=archiveFileClient.getArchiveFileByArchiveIds(ids);
+		List<ArchiveFile>archiveFileList=new ArrayList<>();
+		List<Long> longList = Func.toLongList(ids);
+		for (Long id : longList) {
+			archiveFileList.addAll(archiveFileClient.getArchiveFileByArchiveIds(id+""));
+		}
 		//将除第一个以外的案卷文件archiveId 设置成第一个的id
 		List<ArchiveFile>updateArchiveFileList=new ArrayList<>();
+		int i=1;
 		for (ArchiveFile file : archiveFileList) {
 			if (!file.getArchiveId().equals(auto.getId())) {
 				file.setArchiveId(auto.getId());
-				updateArchiveFileList.add(file);
 			}
+			file.setArchiveSort(i++);
+			updateArchiveFileList.add(file);
 		}
 		archiveFileClient.updateArchiveFile(updateArchiveFileList);
 		auto.setName(name);