文档拆分-bug58763-添加展示顺序排序

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -971,3 +971,6 @@ ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_genera
 -- 法规技术评估 条款项评估结果表增加字段。  2022-08-26
 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result`
     ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`;
+
+-- 表字段 英文修改 2022-08-31
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937';

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -65,10 +65,7 @@ import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -790,8 +787,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         //处理列表表头排序
         if("page".equals(type)) {
-            conditionSb.append(" order by SAR_FILE_SPLIT_MENU.display_seq asc");
+            conditionSb.append(" order by SAR_FILE_SPLIT_MENU.display_seq asc, zhan3_shi4_shun4_xu4 is null, zhan3_shi4_shun4_xu4 asc"); // 默认排序
 
+            // TODO 处理空值排最后
             if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
                 conditionSb.append(", sar_file_split_items." + (String) parameter.get("orderByField"));
                 if ("1".equals((String) parameter.get("orderBy"))) {