From 0597193421d71ea00f1e1e8fd04b4d61095eb8e1 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Thu, 6 Oct 2022 10:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E7=94=9F=E6=88=90=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/readword/ReadWordUtil.java           | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java
index 1c8b1795..55fe147b 100644
--- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java
+++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java
@@ -1,5 +1,28 @@
 package com.actionsoft.apps.coe.pal.datamigration.util.readword;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.usermodel.CharacterRun;
+import org.apache.poi.hwpf.usermodel.Paragraph;
+import org.apache.poi.hwpf.usermodel.Range;
+import org.apache.poi.hwpf.usermodel.Table;
+import org.apache.poi.hwpf.usermodel.TableCell;
+import org.apache.poi.hwpf.usermodel.TableRow;
+
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.coe.pal.datamigration.model.po.WordAttribute;
 import com.actionsoft.apps.coe.pal.datamigration.model.po.WordField;
@@ -11,7 +34,6 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
 import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.bo.engine.BO;
-import com.actionsoft.bpms.commons.database.RowMap;
 import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.bpms.server.fs.DCContext;
 import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
@@ -24,14 +46,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.*;
-
-import java.io.*;
-import java.sql.Timestamp;
-import java.util.*;
-import java.util.stream.Collectors;
 
 @SuppressWarnings("all")
 public class ReadWordUtil {
@@ -733,9 +747,8 @@ public class ReadWordUtil {
      */
     public boolean writeFileTodisk(UserContext me, String reid, String filename, InputStream inputStream, String pl_uuid, String type) throws FileNotFoundException {
         //InputStream ins = new FileInputStream("");
-    	DCContext dcContextpdf = null;
         DCPluginProfile fileProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
-        
+        DCContext dcContextpdf = null;
         //创建数据库数据
         UpfileModel model = new UpfileModel();
         model.setPl_uuid(pl_uuid);
@@ -744,9 +757,10 @@ public class ReadWordUtil {
             model.setType("f");
             dcContextpdf = new DCContext(me, fileProfile, CoEConstant.APP_ID, "file", pl_uuid, filename);
         } else {
+        	 //dcContextpdf = new DCContext(me, fileProfile, CoEConstant.APP_ID, "file", pl_uuid, filename);
+        	dcContextpdf = new DCContext(me, fileProfile, CoEConstant.APP_ID, pl_uuid, reid, filename);
             model.setShape_uuid(reid);
             model.setType("s");
-            dcContextpdf = new DCContext(me, fileProfile, CoEConstant.APP_ID, pl_uuid, reid, filename);
         }
         SDK.getDCAPI().write(inputStream, dcContextpdf);
         model.setUuid(UUIDGener.getUUID());