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 89da404f..72060886 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,29 +1,29 @@
 <?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" desc="目的" isRequired="true"/>
-  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="true"/>
-  <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="true"/>
-  <attribute key="application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
-  <attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
-  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
-  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
-  <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
-  <attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="T_supplementary_articles" 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="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="true" 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="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
-  <attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>
+<attributes type="customer"> 
+  <attribute key="Purpose" title="目的" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true" desc="目的" isRequired="true"/>  
+  <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true" desc="文件编码" isRequired="true"/>  
+  <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="true"/>  
+  <attribute key="application" title="适用范围" type="string" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="T_supplementary_articles" 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="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="true" 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="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="true" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>  
   <attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
 </attributes>
diff --git a/com.actionsoft.apps.coe.pal/method/control.risk/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/control.risk/diagram.attribute.custom.xml
new file mode 100644
index 00000000..c60a5cc7
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal/method/control.risk/diagram.attribute.custom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<attributes type="customer"> 
+  <attribute key="number" title="编号" type="string" value="" desc="编号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="identify" title="标识" type="string" value="" desc="标识" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="note" title="注释" type="string" value="" desc="注释" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="level" title="层次" type="string" value="" desc="层次" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="riskType" title="风险类别" type="select_m" value="" desc="风险类别" isRequired="false" ref="经营决策风险,违反法律法规,财务报告失真,资产安全受到威胁,营私舞弊" readonly="false" groupPath="riskControl" scope="risk" isValid="true"/>  
+  <attribute key="effect" title="风险影响" type="string" value="" desc="风险影响" isRequired="false" ref="" readonly="false" groupPath="riskControl" scope="risk" isValid="true"/>  
+  <attribute key="probability" title="风险概率" type="string" value="" desc="风险概率" isRequired="false" ref="" readonly="false" groupPath="riskControl" scope="risk" isValid="true"/>  
+  <attribute key="targetType" title="控制目标类型" type="select_m" value="" desc="控制目标类型" isRequired="false" ref="C:完整性控制,A:准确性控制,V:有效性控制,R:接触性控制" readonly="false" groupPath="riskControl" scope="risk" isValid="true"/>  
+  <attribute key="target" title="控制目标" type="textarea" value="" desc="控制目标" isRequired="false" ref="" readonly="false" groupPath="riskControl" scope="risk" isValid="true"/>  
+  <attribute key="measure" title="控制措施" type="textarea" value="" desc="控制措施" isRequired="false" ref="" readonly="false" groupPath="riskControl" scope="control" isValid="true"/>  
+  <attribute key="controlMode" title="控制方法" type="select" value="" desc="控制方法" isRequired="false" ref="人工,自动" readonly="false" groupPath="riskControl" scope="control" isValid="true"/>  
+  <attribute key="controlType" title="控制类型" type="select" value="" desc="控制类型" isRequired="false" ref="预防性,发现性" readonly="false" groupPath="riskControl" scope="control" isValid="true"/>  
+  <attribute key="frequency" title="控制频率" type="string" value="" desc="控制频率" isRequired="false" ref="" readonly="false" groupPath="riskControl" scope="control" isValid="true"/>  
+  <attribute key="controlEvidence" title="控制实施证据" type="relation" value="" desc="控制实施证据" isRequired="false" ref="{&quot;method&quot;:&quot;data&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="data_form" scope="control" isValid="true"/>
+</attributes>