优化自动组卷、重组、查询案卷文件展示顺序

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -250,7 +250,7 @@
 
     <select id="approvalFile" resultType="org.springblade.archive.vo.ArchivesAutoVO$ApprovalFile">
         <if test="archiveId!=null">
-            select * from u_archive_file where archive_id = #{archiveId} order by sort
+            select * from u_archive_file where archive_id = #{archiveId} order by archive_sort,sort,sort_num,create_time
         </if>
     </select>
 

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

@@ -5182,9 +5182,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	@Override
 	@Async
 	public void reCreateArchiveAuto1(String ids) {
-		Set<Long> idsSet = new HashSet<>();
 		for (Long id : Func.toLongList(ids)) {
-			idsSet.add(id);
 			//先查出勾选的案卷
 			ArchivesAuto archivesAuto=this.getById(id);
 			//查出所有案卷文件
@@ -5193,9 +5191,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			if (archiveFileList != null && !archiveFileList.isEmpty()) {
 				this.reCreateArchiveAuto(archivesAuto, archiveFileList);
 			}
-		}
-		if (!idsSet.isEmpty()) {
-			this.update(Wrappers.<ArchivesAuto>lambdaUpdate().set(ArchivesAuto::getActionType, 0).in(ArchivesAuto::getId, idsSet));
+			this.update(Wrappers.<ArchivesAuto>lambdaUpdate().set(ArchivesAuto::getActionType, 0).eq(ArchivesAuto::getId, id));
 		}
 	}
 	@Override

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -248,7 +248,7 @@
             end,
             t.tree_sort,
         </if>
-        u.sort,u.sort_num,u.create_time
+        u.archive_sort,u.sort,u.sort_num,u.create_time
         limit #{current}, #{size}
     </select>
 
@@ -433,7 +433,7 @@
           and (is_archive = 0 OR is_archive IS NULL)
           and (is_auto_file is null or is_auto_file != 1)
           and is_deleted = 0
-        order by sort,sort_num,create_time
+        order by archive_sort,sort,sort_num,create_time
     </select>
 
     <select id="getListByNodeIDName" resultMap="archiveFileResultMap">
@@ -443,7 +443,7 @@
           and (is_archive = 0 OR is_archive IS NULL)
           and (is_auto_file is null or is_auto_file != 1)
           and is_deleted = 0
-        order by sort,sort_num,create_time
+        order by archive_sort,sort,sort_num,create_time
     </select>
 
     <select id="getArchiveFileByArchiveID" resultMap="archiveFileResultMap">