From 9224351aaa02b4eab8e139ed124a0c7504a6151e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=9F=E6=9E=97=E5=B8=86?= <zlf264035@163.com>
Date: Mon, 4 Jul 2022 01:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/output/pr/report1/Report1Gener.java   |  2 +-
 .../diagram.attribute.custom.xml              | 30 +++++++++----------
 .../制度-手册(修改中).xml                     |  4 +--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
index 48967483..84815358 100644
--- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
+++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
@@ -201,7 +201,7 @@ public class Report1Gener {
 		Set<String> dangerSet = new HashSet<String>();// 风险
 		Set<String> regulateSet = new HashSet<String>();// 控制
 		Set<String> KPISet = new HashSet<String>();// kpi
-		System.out.println("id======================="+repositoryId);
+		//System.out.println("id======================="+repositoryId);
 		
 		List<Map<String, Object>> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容
 		if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序
diff --git a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
index c051c3fd..24704fcb 100644
--- a/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
+++ b/com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes type="customer"> 
-  <attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true" desc="目的" isRequired="false"/>  
+  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="false"/>  
   <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="application" title="适用范围" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="versions" title="版本" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="application" title="适用范围" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="versions" title="版本" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="auditor" title="审核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="reviewer" title="复核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="auditor" title="审核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="reviewer" title="复核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="related_files" title="相关文件" type="relation" value="" desc="1" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="support_files" title="支持文件" type="relation" value="" desc="1" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" desc="流程绩效" isRequired="false" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="pre_process" title="前置流程" type="relation" value="" desc="前置流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="next_process" title="后置流程" type="relation" value="" desc="后置流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="related_knowledge" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="false" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="false" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;listing1&quot;,&quot;secondColumn&quot;:&quot;listing2&quot;}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;listing1&quot;,&quot;secondColumn&quot;:&quot;listing2&quot;}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
+  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;listing1&quot;,&quot;secondColumn&quot;:&quot;listing2&quot;}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
 </attributes>
diff --git a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml
index 65164137..b4a82a6a 100644
--- a/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml
+++ b/com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml
@@ -2800,7 +2800,7 @@
                                     <w:sz w:val="22"/>
                                     <w:sz-cs w:val="20"/>
                                 </w:rPr>
-                                <w:t>${pl_P_versions}</w:t>
+                                <w:t>${pl_versions}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -3509,7 +3509,7 @@
                                 </w:rPr>
                             </w:pPr>
                             <w:r wsp:rsidRPr="0064057C">
-                                <w:t>${pl_P_versions}</w:t>
+                                <w:t>${pl_versions}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>