From de587f6e87e6c959ea90877e0475feaa2b49c6b9 Mon Sep 17 00:00:00 2001
From: anhc <3442943606@qq.com>
Date: Tue, 28 Jun 2022 15:13:03 +0800
Subject: [PATCH] =?UTF-8?q?pal=20=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5Word=20=E8=A1=A8=E6=A0=BC=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datamigration/web/DataMigrationWeb.java   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java
index ff5c3a97..f30b882d 100644
--- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java
+++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java
@@ -11,7 +11,9 @@ import com.actionsoft.apps.coe.pal.datamigration.model.po.WordField;
 import com.actionsoft.apps.coe.pal.datamigration.util.ExcelUtil;
 import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil;
 import com.actionsoft.apps.coe.pal.datamigration.util.WordUtil;
+import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
 import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel;
+import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
@@ -52,6 +54,7 @@ import com.actionsoft.sdk.local.SDK;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.dom4j.Document;
 
 import java.io.File;
@@ -1732,7 +1735,21 @@ public class DataMigrationWeb extends ActionWeb {
                 }
                 if (array.size() > 0) {
                     //特殊处理表头
-                    array.getJSONObject(0).put("id", "table_head");
+                    PALMethodAttributeModel attributeModel = null;
+                    List<PALMethodAttributeModel> attributes = PALMethodCache.getPALMethodModelById(importModel.getMethodId()).getAttributes();
+                    for (PALMethodAttributeModel attribute : attributes) {
+                        if (attribute.getType().equals(importProperty.getPropertyId())){
+                            attributeModel = attribute;
+                        }
+                    }
+                    if (null == attributeModel || StringUtils.isEmpty(attributeModel.getRef())){
+                        array.getJSONObject(0).put("id", "table_head");
+                    }else{
+                        JSONObject attrRef = JSON.parseObject(attributeModel.getRef());
+                        array.getJSONObject(0).put("id", "table_head");
+                        array.getJSONObject(0).put("id", attrRef.get("firstColumn"));
+                        array.getJSONObject(0).put("id", attrRef.get("secondColumn"));
+                    }
                 }
                 object.put("table", array);
                 //更新数据库值