|
|
@@ -375,12 +375,12 @@
|
|
|
ORDER BY
|
|
|
m.tree_sort,
|
|
|
CASE WHEN u.file_number IS NULL THEN 1 ELSE 0 END,
|
|
|
- trailing_number,u.create_time
|
|
|
+ trailing_number,u.auto_file_sort,u.create_time
|
|
|
</when>
|
|
|
<when test="vo.sortRuleType != null and vo.sortRuleType == 2 and vo.isArchive != null and vo.isArchive != ''">
|
|
|
order by
|
|
|
CASE WHEN u.file_number IS NULL THEN 1 ELSE 0 END,
|
|
|
- trailing_number,u.create_time
|
|
|
+ trailing_number,u.auto_file_sort,u.create_time
|
|
|
</when>
|
|
|
<otherwise>
|
|
|
order by m.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,
|