From 60b565daa2998fb0e53797f0b607d4bc7994d1b9 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 9 Aug 2024 10:58:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(88325):=20=E6=9B=B4=E6=8D=A2=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/xml/LawsCommonMapper.xml | 18 ++++++++++++++++-- .../impl/FileSplitItemsEOServiceImpl.java | 6 +++--- .../com/jero/modules/tag/entity/LawsTag.java | 6 ++++++ .../jero/modules/tag/enums/TableNameEnum.java | 3 ++- .../resources/excelTemplate/条款导入模板.xlsx | Bin 38485 -> 38698 bytes 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index d02fce6b..d7d78e0e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -6,9 +6,23 @@ SELECT * FROM laws_tag tag LEFT JOIN laws_area area ON tag.show_area = area.id - WHERE tag.table_name = #{tableName} + + + WHERE tag.table_name = 'laws_document_split' + + + WHERE tag.table_name = #{tableName} + + AND tag.del_flag = 0 - ORDER BY area.sort ASC, tag.order_num ASC, tag.create_time ASC + + + ORDER BY import_sort + + + ORDER BY area.sort ASC, tag.order_num ASC, tag.create_time ASC + +