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);