From 41549c0c3e5b24a021ffba3ee68d64477f8dfe7c Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 5 Aug 2024 11:23:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20un?= =?UTF-8?q?=20=E6=8B=86=E5=88=86=E6=A0=87=E9=A2=98=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/split/service/impl/FileSpiltService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 62988cef..bfa57d7f 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -1154,7 +1154,7 @@ public class FileSpiltService { TitleNumberVO titleNumberVO = AsposeUtil.getNumber(is2); //TitleNumberVO titleNumberVO = new TitleNumberVO(); Map> titleNumberMap = titleNumberVO.getTitleNumberMap(); - + List emptyTitleList = titleNumberVO.getEmptyTitleList(); // 记录拆分后的每一段文字 List elements = doc.getBodyElements(); // 记录word自动生成的编号数据 @@ -1352,7 +1352,8 @@ public class FileSpiltService { preNameNum = g; message.setMenuId(sarFileSplitMenuEO.getId()); // addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); - if(!org.apache.commons.lang.StringUtils.isEmpty(itemName) && !message.getItemsCondi().get(message.getItemsCondi().size() - 1).equals(paragraphString)){ +// if(!org.apache.commons.lang.StringUtils.isEmpty(itemName) && !message.getItemsCondi().get(message.getItemsCondi().size() - 1).equals(paragraphString)){ + if(!StringUtils.isEmpty(itemName) && !paragraphString.endsWith(itemName)){ addItermsConditionsText(message, itemValList, paragraphString.substring(startDigit.length()), p.getAlignment()); } messageList.add(message);