From 95a6b388c455298664d08e8106eaf14a1a891d85 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Thu, 5 Jan 2023 15:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E7=AE=80?=
 =?UTF-8?q?=E5=8E=86=E5=90=88=E5=B9=B6=E5=9B=BE=E7=89=87=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8820230105=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PersonnelResumeServiceImpl.java      | 26 +++++++++++++++++++
 .../organization/util/word/WordUtil.java      |  1 -
 .../web/PersonnelResumeController.java        |  3 ---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
index b842dea7..4b4ba3d6 100644
--- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
+++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
@@ -33,7 +33,9 @@ import com.engine.organization.util.tree.SearchTreeUtil;
 import com.engine.organization.util.word.CustomXWPFDocument;
 import com.engine.organization.util.word.WordUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.xwpf.usermodel.Document;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFPictureData;
 import org.apache.xmlbeans.XmlOptions;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
 import weaver.general.GCONST;
@@ -315,6 +317,17 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         CustomXWPFDocument src2Document = doucDocument2;
         CTBody src2Body = src2Document.getDocument().getBody();
         XWPFParagraph p2 = src2Document.createParagraph();
+
+        //处理合并后文档图片冲突
+        List<XWPFPictureData> allPictures = src2Document.getAllPictures();
+        Map<String, String> map = new HashMap();
+        for (XWPFPictureData picture : allPictures) {
+            String before = src2Document.getRelationId(picture);
+            //将原文档中的图片加入到目标文档中
+            String after = src1Document.addPictureData(picture.getData(), Document.PICTURE_TYPE_JPEG);
+            map.put(before, after);
+        }
+
         XmlOptions optionsOuter = new XmlOptions();
         optionsOuter.setSaveOuter();
         String appendString = src2Body.xmlText(optionsOuter);
@@ -323,6 +336,19 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         String mainPart = srcString.substring(srcString.indexOf(">") + 1, srcString.lastIndexOf("<"));
         String sufix = srcString.substring(srcString.lastIndexOf("<"));
         String addPart = appendString.substring(appendString.indexOf(">") + 1, appendString.lastIndexOf("<"));
+        if (map != null && !map.isEmpty()) {
+            ListIterator<Map.Entry<String, String>> i = new ArrayList<>(map.entrySet()).listIterator(map.size());
+            LinkedHashMap<String, String> linkedHashMap = new LinkedHashMap<String, String>();
+            while (i.hasPrevious()) {
+                Map.Entry<String, String> entry = i.previous();
+                linkedHashMap.put(entry.getKey(), entry.getValue());
+            }
+            Iterator it1 = linkedHashMap.entrySet().iterator();
+            while (it1.hasNext()) {
+                Map.Entry<String, String> entry = (Map.Entry<String, String>) it1.next();
+                addPart = addPart.replace("<a:blip r:embed=\"" + entry.getKey(), "<a:blip r:embed=\"" + entry.getValue());
+            }
+        }
         CTBody makeBody = CTBody.Factory.parse(prefix + mainPart + addPart + sufix);
         src1Body.set(makeBody);
         return src1Document;
diff --git a/src/com/engine/organization/util/word/WordUtil.java b/src/com/engine/organization/util/word/WordUtil.java
index acce7153..e2cf17d2 100644
--- a/src/com/engine/organization/util/word/WordUtil.java
+++ b/src/com/engine/organization/util/word/WordUtil.java
@@ -11,7 +11,6 @@ import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/src/com/engine/organization/web/PersonnelResumeController.java b/src/com/engine/organization/web/PersonnelResumeController.java
index d8ac6c72..82c81b93 100644
--- a/src/com/engine/organization/web/PersonnelResumeController.java
+++ b/src/com/engine/organization/web/PersonnelResumeController.java
@@ -12,7 +12,6 @@ import weaver.general.Util;
 import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.GET;
@@ -24,10 +23,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
 import java.io.*;
 import java.net.URLEncoder;
-import java.time.LocalDate;
 import java.util.Map;
 
 /**