From 55f190d261c07f51fcd5dc74eef02cde918725b4 Mon Sep 17 00:00:00 2001
From: zhaol <15900249928@163.com>
Date: Tue, 29 Oct 2024 13:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=86=8C=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coe/pal/pal/output/util/OutputWordUtil.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
index 9e3a71c4..1408566c 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
@@ -439,7 +439,12 @@ public class OutputWordUtil {
                             for (int i = 0; i < versionHistoryTable.size(); i++) {
                                 JSONObject jsonObject = versionHistoryTable.getJSONObject(i);
                                 String[] strArray = new String[8];
-                                strArray[0] = jsonObject.getString("versions").toString();
+
+                                if(repositoryModel.getMethodId().equals("process.scheme")){
+                                    strArray[0] = jsonObject.getString("P_versions").toString();
+                                }else{
+                                    strArray[0] = jsonObject.getString("versions").toString();
+                                }
                                 strArray[1] = jsonObject.getString("Issuing_department").toString();
                                 strArray[2] = jsonObject.getString("Drafted_and_revised_by").toString();
                                 strArray[3] = jsonObject.getString("Drafted_and_revised_date").toString();
@@ -2444,8 +2449,15 @@ public class OutputWordUtil {
             }
             JSONObject obj = new JSONObject();
             Map<String, JSONObject> map = PALRepositoryQueryAPIManager.queryRepositoryAttributeById(model.getId());
+            String methodId=repositoryModel.getMethodId();
+            String attr;
+            if(methodId.equals("process.scheme")){
+                attr="P_versions";
+            }else{
+                attr="versions";
+            }
             // 版本P_versions，制度用的是versions
-            String attr = "versions";
+            //String attr = "versions";
             String val = "";
             String plvers = model.getVersion() + "";
             String plver = "";