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 cf45e36b..596db466 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 @@ -362,10 +362,12 @@ public class FileSpiltService { if (CollectionUtils.isNotEmpty(titleNumberMap.get(paragraphString))){ replaceNumberFlag = true; List stringList = titleNumberMap.get(paragraphString); - replaceNumber = stringList.get(0); - //replaceNumber = titleNumberMap.get(paragraphString); - paragraphString = replaceNumber + paragraphString; - stringList.remove(0); + if(CollectionUtils.isNotEmpty(stringList)){ + replaceNumber = stringList.get(0); + //replaceNumber = titleNumberMap.get(paragraphString); + paragraphString = replaceNumber + paragraphString; + stringList.remove(0); + } } } String startDigit; @@ -679,6 +681,22 @@ public class FileSpiltService { c.selectPath("./*"); while (c.toNextSelection()) { XmlObject o = c.getObject(); + if(o.getDomNode().getNodeName().equals("w:pict")){ + String str = o.toString(); + String imgId = ""; + Pattern pattern = Pattern.compile("v:imagedata r:id=\"([^\"]+)\""); + Matcher matcher = pattern.matcher(str); + // 查找匹配项 + if (matcher.find()) { + // 提取捕获组中的内容 + String result = matcher.group(1); + imgId = result; + } + if(StringUtils.isNotBlank(imgId)){ + imageBundleList.add(imgId); + continue; + } + } if(o.getDomNode().getNodeName().equals("mc:AlternateContent")){ String str = o.toString(); String imgId = "";