From 970210629ec4b0174b5409a9e55230c5c0897725 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Mon, 5 Sep 2022 17:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E6=89=8B=E5=86=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=89=88=E6=9C=AC=E5=8F=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datamigration/util/readword/ReadWordUtil.java  |  2 +-
 .../coe/pal/output/zd/report1/Report1Gener.java    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 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 fe10945d..de4d73ac 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
@@ -679,7 +679,7 @@ public class ReadWordUtil {
     public static PALRepositoryModel getRepositoryByName(String wsId, String repositoryName) {
         List<PALRepositoryModel> palRepositoryModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getAllCoeProcessLevelByWsId(wsId);
         for (PALRepositoryModel palRepositoryModel : palRepositoryModels) {
-            if (palRepositoryModel.getName().equals(repositoryName)) {
+            if (palRepositoryModel.getName().equals(repositoryName)&&palRepositoryModel.isUse()) {
                 return palRepositoryModel;
             }
         }
diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
index 9f5ffba2..72b8f2e5 100644
--- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
+++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
@@ -690,8 +690,18 @@ public class Report1Gener {
 			// 版本P_versions，制度用的是versions
 			String attr = "versions";
 			String val = "";
-			val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
-			obj.put(attr, val);
+			String plvers = model.getVersion()+"";
+			String plver = "";
+			if (!"".equals(plvers)) {
+				if (plvers.length() > 1) {
+					plver = plvers.substring(0, 1) + "."
+							+ plvers.substring(plvers.length() - 1, plvers.length());
+				} else {
+					plver = plvers.substring(0, 1) + ".0";
+				}
+			}
+			//val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);
+			obj.put(attr, "V"+plver);
 			// 拟制/修订单位Issuing_department
 			attr = "Issuing_department";
 			val = specialCharTransfer(map.containsKey(attr) ? (map.get(attr).getString("text")) : "").replace("\n", WRAPSTRING);