Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

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

@@ -1433,6 +1433,7 @@
         <foreach collection="nodeIds" item="nodeId" open="(" separator="," close=")">
             #{nodeId}
         </foreach>
-        ORDER BY uaa.auto_file_sort Asc
+        order by uatc.tree_sort,uaa.auto_file_sort is null ,uaa.auto_file_sort,uaa.file_number is null,
+        SUBSTRING_INDEX(uaa.file_number, '_', 1), SUBSTRING_INDEX(uaa.file_number, '_', -1) + 0 ,uaa.create_time asc
     </select>
 </mapper>