From 444cd13bf7cafe7014394af817c212ad9814602b Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Thu, 7 Mar 2024 10:22:12 +0800 Subject: [PATCH] =?UTF-8?q?82355-=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=90=8E=E6=9C=89=E5=92=8C=E6=A0=87=E9=A2=98=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=E7=9A=84=E6=AD=A3=E6=96=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/documenttool/mapper/xml/DocumentSplitMapper.xml | 2 +- .../com/jero/modules/split/service/impl/FileSpiltService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml index fc25f20..b5446e0 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -171,7 +171,7 @@ laws_document_split lds left join SAR_FILE_SPLIT_MENU m on lds.MENU_ID = m.id - order by lds.create_time desc + order by lds.sort_number is null, (lds.sort_number + 0) asc diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 7e0ff38..dbefd7a 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -372,7 +372,7 @@ public class FileSpiltService { preName = startDigit; preNameNum = g; message.setMenuId(sarFileSplitMenuEO.getId()); - if(!StringUtils.isEmpty(itemName)){ + if(!StringUtils.isEmpty(itemName) && !paragraphString.endsWith(itemName)){ addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); } message.setApplicableComponents(partName);