From 77b22283702b89f18bcdeef9f2e9afd3048d5869 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sat, 7 Sep 2024 13:48:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201997-2003=E7=89=88=E6=9C=ACdoc=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E7=89=87=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../split/service/impl/FileSpiltService.java  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 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 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<String> 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 = "";