档案更新案卷四要素文件内容按节点排序

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

@@ -4579,7 +4579,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		String[] ids = archiveIds.split(",");
 		for (String archiveId : ids) {
 			ArchivesAuto auto = baseMapper.selectById(archiveId);
-			String sql = "select * from u_archive_file where archive_id = " + archiveId + " and is_deleted = 0 order by sort,sort_num,create_time";
+			String sql = "SELECT u.* FROM u_archive_file u LEFT JOIN m_archive_tree_contract m ON u.node_id = m.id WHERE u.archive_id = "+archiveId+" AND u.is_deleted = 0 ORDER BY m.sort, u.sort, u.sort_num, u.create_time";
 			//List<ArchiveFile> archiveFiles = archiveFileClient.getArchiveFileByArchiveID(Long.valueOf(archiveId));
 			List<ArchiveFile> archiveFiles = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ArchiveFile.class));
 			archiveAutoPdfService.buildArchiveFrontPdfs(projectId, auto, archiveFiles, true);