From 2822f98548c54afd6d2982826741aabe64a673ec Mon Sep 17 00:00:00 2001 From: wangchengjun <616865598@qq.com> Date: Wed, 15 Jun 2022 17:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=AD=E7=A9=BA=E8=A1=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 9a89bcfbd..de7e73bee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -306,7 +306,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStart(nowStart.get(i)); menuCanAdd = true; @@ -544,7 +546,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStart(nowStart.get(i)); menuCanAdd = true; @@ -728,7 +732,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartUS(nowStart.get(i)); menuCanAdd = true; @@ -1102,7 +1108,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartJapanTwo(lastStrTemp, secondStrTemp, nowStart.get(i)); menuCanAdd = true; @@ -1276,7 +1284,10 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); +// addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartEU(nowStart.get(i)); menuCanAdd = true; @@ -1453,7 +1464,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartKmvssArticle(lastStr, nowStart.get(i)); menuCanAdd = true; @@ -1676,7 +1689,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartKmvssTable(catalogerArr, nowStart.get(i), menuLevel); menuCanAdd = true;