diff --git a/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java b/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java index 13b029e4..dbd5d792 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java @@ -8,10 +8,8 @@ import org.apache.commons.logging.Log; import org.apache.poi.xwpf.usermodel.VerticalAlign; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; /** * @author liJiaRao @@ -28,6 +26,7 @@ public class AsposeUtil { TitleNumberVO titleNumberVO = new TitleNumberVO(); Map> titleNumberMap = new HashMap<>(); List emptyTitleList = new ArrayList<>(); + List titleNumberList = new ArrayList<>(); try { Document doc = new Document(is); @@ -60,7 +59,9 @@ public class AsposeUtil { labelString = listLabel.getLabelString().trim(); labelString = labelString.replaceAll("\t", "").replaceAll("\b", "") .replaceAll(" ", "").replaceAll("\"", "").replaceAll("'", "").replaceAll(" ", ""); - + if (StringUtils.isBlank(labelString)){ + continue; + } if (StringUtils.isNotBlank(text)) { if (titleNumberMap.containsKey(text)) { List strings = titleNumberMap.get(text); @@ -70,6 +71,7 @@ public class AsposeUtil { strings.add(labelString); titleNumberMap.put(text, strings); } + titleNumberList.add(labelString); } else { emptyTitleList.add(labelString); } @@ -80,6 +82,7 @@ public class AsposeUtil { e.printStackTrace(); } titleNumberVO.setTitleNumberMap(titleNumberMap); + emptyTitleList.removeIf(titleNumberList::contains); titleNumberVO.setEmptyTitleList(emptyTitleList); return titleNumberVO; }