Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

# Conflicts:
#	com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar

com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml

@@ -4,27 +4,26 @@
   <attribute key="auditor" title="审核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审核人" isRequired="false"/>  
   <attribute key="reviewer" title="复核人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="复核人" isRequired="false"/>  
   <attribute key="approver" title="审批人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="审批人" isRequired="false"/>  
-  <attribute key="application" title="适用范围" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="application" title="适用范围" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="适用范围" isRequired="false"/>  
   <attribute key="file_number" title="文件编码" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="文件编码" isRequired="false"/>  
-  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="22" isRequired="false"/>  
+  <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L1" isRequired="false"/>  
-  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构l2" isRequired="false"/>  
+  <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L2" isRequired="false"/>  
   <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="流程架构L3" isRequired="false"/>  
-  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="ARIS" title="ARIS地址" type="string" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true" desc="ARIS地址" isRequired="false"/>  
-  <attribute key="ARIS" title="ARIS地址" type="string" value="" ref="" readonly="false" groupPath="organization" scope="%" isValid="true"/>  
   <attribute key="P_versions" title="版本" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="版本" isRequired="true"/>  
-  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="拟制/修订人" isRequired="false"/>  
-  <attribute key="T_supplementary_articles" title="附则" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="T_supplementary_articles" title="附则" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="附则" isRequired="false"/>  
-  <attribute key="goal" title="目的" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="1" isRequired="true"/>  
+  <attribute key="goal" title="目的" type="string" value="" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true" desc="目的" isRequired="true"/>  
-  <attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="activity_number" title="活动序号" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动序号" isRequired="false"/>  
-  <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="Process_performance_metrics" title="流程绩效" type="relation" value="" ref="{&quot;method&quot;:&quot;control.kpi&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="流程绩效" isRequired="false"/>  
   <attribute key="activity_description" title="活动描述" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="活动描述" isRequired="true"/>  
-  <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="output" title="输出" type="textarea" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="输出" isRequired="false"/>  
   <attribute key="R_relevant_flies" title="相关文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="相关文件" isRequired="false"/>  
   <attribute key="support_files" title="支持文件" type="relation" value="" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="process_model" scope="%" isValid="true" desc="支持文件" isRequired="false"/>  
   <attribute key="relevant_flies" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="input" title="输入" type="textarea" value="" desc="输入" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="relevant_demand" title="相关要求" type="relation" value="" desc="相关要求" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="false"/>  
-  <attribute key="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&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="post" title="岗位" type="relation" value="" desc="岗位" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="role" title="角色" type="relation" value="" desc="角色" isRequired="false" ref="{&quot;method&quot;:&quot;org.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
   <attribute key="information_systems" title="信息系统" type="relation" value="" desc="信息系统" isRequired="false" ref="{&quot;method&quot;:&quot;itsystem.normal&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
@@ -35,4 +34,7 @@
   <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="process_model" scope="%" isValid="true"/>  
   <attribute key="Whether_issued" title="是否发布" type="string" value="" desc="是否发布" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="ARIS_process_name" title="ARIS流程名称" type="string" value="" desc="ARIS流程名称" isRequired="false" ref="" readonly="false" groupPath="process_model" scope="%" isValid="true"/>  
+  <attribute key="lead_process" 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="process_model" scope="%" isValid="true"/>  
+  <attribute key="rear_process" 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="process_model" scope="%" isValid="true"/>  
+  <attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> 
 </attributes>

com.actionsoft.apps.coe.method.process.flowchart/method/process.flowchart/diagram.schema.tpl

@@ -296,6 +296,136 @@
     {lineStyle:{lineWidth:2, lineStyle:"dashed"}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
 ]});
 
+Schema.addGlobalCommand("method_script_task", [
+    {action:"move", x:"100*0.15- 100*0.05", y:"60*0.24- 60*0.1"},
+    {action:"line", x:"100*0.15 + 100*0.05", y:"60*0.24 - 60*0.1"},
+    {action:"curve", x1:"100*0.15 + 100*0.02", y1:"60*0.24 - 60*0.1", x2:"100*0.15 + 100*0.02", y2:"60*0.24", x:"100*0.15 + 100*0.04", y:"60*0.24"},
+    {action:"curve", x1:"100*0.15 + 100*0.06", y1:"60*0.24", x2:"100*0.15 + 100*0.06", y2:"60*0.24 + 60*0.1", x:"100*0.15 + 100*0.03", y:"60*0.24 + 60*0.1"},
+    {action:"line", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.1"},
+    {action:"curve", x1:"100*0.15 - 100*0.05", y1:"60*0.24 + 60*0.1", x2:"100*0.15 - 100*0.05", y2:"60*0.24", x:"100*0.15 - 100*0.07", y:"60*0.24"},
+    {action:"curve", x1:"100*0.15 - 100*0.09", y1:"60*0.24", x2:"100*0.15 - 100*0.09", y2:"60*0.24 - 60*0.1", x:"100*0.15 - 100*0.05", y:"60*0.24 - 60*0.1"},
+    {action:"close"},
+    {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 - 60*0.05"},
+    {action:"line", x:"100*0.15 + 100*0.025", y:"60*0.24 - 60*0.05"},
+    {action:"move", x:"100*0.15 - 100*0.07", y:"60*0.24 - 0"},
+    {action:"line", x:"100*0.15 + 100*0.04", y:"60*0.24 - 0"},
+    {action:"move", x:"100*0.15 - 100*0.055", y:"60*0.24 + 60*0.06"},
+    {action:"line", x:"100*0.15 + 100*0.05", y:"60*0.24 + 60*0.06"}
+]);
+
+/***Method*/Schema.addShape({name:"method_approval_node", title:"线上审批", text:"线上审批",groupName:"features", category:"process_flowchart", props:{w:150, h:66}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+        {actions:[
+            {action:"move", x:"w*0", y:"5"},
+            {action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
+            {action:"line", x:"w-5", y:"0"},
+            {action:"quadraticCurve", x1:"w", y1:"0", x:"w", y:"5"},
+            {action:"line", x:"w", y:"h-5"},
+            {action:"quadraticCurve", x1:"w", y1:"h", x:"w-5", y:"h"},
+            {action:"line", x:"5", y:"h"},
+            {action:"quadraticCurve", x1:"0", y1:"h", x:"0", y:"h-5"},
+            {action:"line", x:"0", y:"5"},
+            {action:"close"}
+        ]},
+        {lineStyle:{lineStyle:"solid"}, actions:{ref:"roundRectangle"}},
+        {lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid", color:"255,255,255"}, actions:{ref:"method_script_task"}},
+        {lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
+    ]});
+
+    Schema.addGlobalCommand("business_rule", [
+        {action:"move", x:"100*0.15- 100*0.08", y:"60*0.24- 60*0.1"},
+        {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24- 60*0.1"},
+        {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.1"},
+        {action:"line", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.1"},
+        {action:"close"},
+        {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 - 60*0.05"},
+        {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 - 60*0.05"},
+        {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.0"},
+        {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.0"},
+        {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.05"},
+        {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.05"},
+        {action:"move", x:"100*0.15 - 100*0.04", y:"60*0.24 - 60*0.1"},
+        {action:"line", x:"100*0.15 - 100*0.04", y:"60*0.24 + 60*0.1"}
+    ]);
+
+
+
+    Schema.addShape({name:"method_service_node", title:"线下审批", text:"线下审批",groupName:"features", category:"process_flowchart", props:{w:150, h:66}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+        {actions:[
+            {action:"move", x:"w*0", y:"5"},
+            {action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
+            {action:"line", x:"w-5", y:"0"},
+            {action:"quadraticCurve", x1:"w", y1:"0", x:"w", y:"5"},
+            {action:"line", x:"w", y:"h-5"},
+            {action:"quadraticCurve", x1:"w", y1:"h", x:"w-5", y:"h"},
+            {action:"line", x:"5", y:"h"},
+            {action:"quadraticCurve", x1:"0", y1:"h", x:"0", y:"h-5"},
+            {action:"line", x:"0", y:"5"},
+            {action:"close"}
+        ]},
+
+    {lineStyle:{lineStyle:"solid"}, actions:{ref:"roundRectangle"}},
+    {lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid"}, actions:{ref:"business_rule"}},
+    {lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
+
+
+    ]});
+/***Method*/Schema.addShape({name:"method_approval_node3", title:"系统任务", text:"系统任务",groupName:"features3", category:"process_flowchart", props:{w:150, h:66}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+    {actions:[
+        {action:"move", x:"w*0", y:"5"},
+        {action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
+        {action:"line", x:"w-5", y:"0"},
+        {action:"quadraticCurve", x1:"w", y1:"0", x:"w", y:"5"},
+        {action:"line", x:"w", y:"h-5"},
+        {action:"quadraticCurve", x1:"w", y1:"h", x:"w-5", y:"h"},
+        {action:"line", x:"5", y:"h"},
+        {action:"quadraticCurve", x1:"0", y1:"h", x:"0", y:"h-5"},
+        {action:"line", x:"0", y:"5"},
+        {action:"close"}
+    ]},
+    {lineStyle:{lineStyle:"solid"}, actions:{ref:"roundRectangle"}},
+    {lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid", color:"255,255,255"}, actions:{ref:"method_script_task"}},
+    {lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
+]});
+
+Schema.addGlobalCommand("business_rule", [
+    {action:"move", x:"100*0.15- 100*0.08", y:"60*0.24- 60*0.1"},
+    {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24- 60*0.1"},
+    {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.1"},
+    {action:"line", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.1"},
+    {action:"close"},
+    {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 - 60*0.05"},
+    {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 - 60*0.05"},
+    {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.0"},
+    {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.0"},
+    {action:"move", x:"100*0.15 - 100*0.08", y:"60*0.24 + 60*0.05"},
+    {action:"line", x:"100*0.15 + 100*0.08", y:"60*0.24 + 60*0.05"},
+    {action:"move", x:"100*0.15 - 100*0.04", y:"60*0.24 - 60*0.1"},
+    {action:"line", x:"100*0.15 - 100*0.04", y:"60*0.24 + 60*0.1"}
+]);
+
+
+
+Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工任务",groupName:"features3", category:"process_flowchart", props:{w:150, h:66}, lineStyle:{lineWidth:1, lineColor:"137,188,255"}, fillStyle:{type:"gradient", gradientType:"linear", beginColor:"245,250,255", endColor:"232,242,255", angle:Math.PI * 0.5}, path:[
+    {actions:[
+        {action:"move", x:"w*0", y:"5"},
+        {action:"quadraticCurve", x1:"0", y1:"0", x:"5", y:"0"},
+        {action:"line", x:"w-5", y:"0"},
+        {action:"quadraticCurve", x1:"w", y1:"0", x:"w", y:"5"},
+        {action:"line", x:"w", y:"h-5"},
+        {action:"quadraticCurve", x1:"w", y1:"h", x:"w-5", y:"h"},
+        {action:"line", x:"5", y:"h"},
+        {action:"quadraticCurve", x1:"0", y1:"h", x:"0", y:"h-5"},
+        {action:"line", x:"0", y:"5"},
+        {action:"close"}
+    ]},
+
+{lineStyle:{lineStyle:"solid"}, actions:{ref:"roundRectangle"}},
+{lineStyle:{lineWidth:1, lineColor:"137,188,255", lineStyle:"solid"}, fillStyle:{type:"solid"}, actions:{ref:"business_rule"}},
+{lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"roundRectangle"}}
+
+
+]});
+
 
 /*泳池/泳道分组*/
 Schema.addCategory({name:"lane", text:"泳池/泳道"});

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/BatchController.java

@@ -34,9 +34,9 @@ public class BatchController {
 	 * @return
 	 */
 	@Mapping("com.actionsoft.apps.coe.pal.batch_create_download_template")
-	public String getDownloadTemplateUrl(UserContext uc, String type, String wsId, String versionIds) {
+	public String getDownloadTemplateUrl(UserContext uc, String type, String wsId, String versionIds, String methodCategory) {
 		BatchWeb web = new BatchWeb(uc);
-		return web.getDownloadTemplateUrl(type, wsId, versionIds);
+		return web.getDownloadTemplateUrl(type, wsId, versionIds, methodCategory);
 	}
 	
 	/**
@@ -102,9 +102,9 @@ public class BatchController {
 	 * @return
 	 */
 	@Mapping("com.actionsoft.apps.coe.pal.batch_create_process_data_check")
-	public String checkProcessData(UserContext uc, String wsId, String teamId, String type, String fileValue, String fileName) {
+	public String checkProcessData(UserContext uc, String wsId, String teamId, String type, String fileValue, String fileName, String methodCategory) {
 		BatchWeb web = new BatchWeb(uc);
-		return web.checkProcessData(wsId, teamId, type, fileValue, fileName);
+		return web.checkProcessData(wsId, teamId, type, fileValue, fileName, methodCategory);
 	}
 	
 	/**
@@ -114,9 +114,9 @@ public class BatchController {
 	 * @return
 	 */
 	@Mapping("com.actionsoft.apps.coe.pal.batch_create_data_save")
-	public String saveBatchCreateData(UserContext uc, String param) {
+	public String saveBatchCreateData(UserContext uc, String param, String methodCategory) {
 		BatchWeb web = new BatchWeb(uc);
-		return web.saveBatchCreateData(param);
+		return web.saveBatchCreateData(param, methodCategory);
 	}
 	
 	/**

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/constant/BatchConst.java

@@ -28,10 +28,24 @@ public class BatchConst {
 	// 模版文件路径
 	public static final String TEMPLATE_FILE_PATH = AppsConst.APPS_ROOT + AppsConst.FOLDER_INSTALL + File.separator + APP_ID + File.separator + "excel" + File.separator;
 	// 模版文件名称
-	public static final String PROCESS_LIST_TEMPLATE_FILE = "流程清单模板样例.xlsx";
+	public static final String PROCESS_LIST_TEMPLATE_FILE_SUFFIX = "清单模板.xlsx";
-	public static final String SHAPE_LIST_TEMPLATE_FILE = "模型结构模板样例.xlsx";
+	public static final String SHAPE_LIST_TEMPLATE_FILE = "模型结构模板.xlsx";
 	
 	// 日志结束语
 	public static final String END_LOG = "**建议拷贝本次输出日志做备忘";
 
+	public final static String IMPORT_LOG_FILE_SUCCESS = "successImport.log";// 导入成功日志单独记录，只记录pal流程名称与对应的Aris地址，客户需要
+
+	public final static String IMPORT_LOG_FILE_MATCH_ERR = "matchErrImport.log";// 导入aris流程匹配失败的
+
+	// 日志常量记录
+	public static final String LOG_SUCCESS = "[成功]";
+	public static final String LOG_WARNING = "[警告]";
+	public static final String LOG_ERROR = "[错误]";
+	// 日志导入开始节点
+	public static final String LOG_START = "[开始]";
+	// 日志导入完成节点
+	public static final String LOG_END = "[完成]";
+	public static final String LOG_DESC = "[说明]";
+	
 }

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/BatchWeb.java

@@ -23,6 +23,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.CoeDesignerShapeAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
+import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
 import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
 import com.actionsoft.bpms.commons.mvc.view.ActionWeb;
@@ -89,9 +90,10 @@ public class BatchWeb extends ActionWeb {
 	 * @param type processList: 流程清单模版 shapeList:流程结构模版
 	 * @param wsId 
 	 * @param versionIds 流程版本Id集合，type为shapeList时有效
+	 * @param methodCategory 大类
 	 * @return
 	 */
-	public String getDownloadTemplateUrl(String type, String wsId, String versionIds) {
+	public String getDownloadTemplateUrl(String type, String wsId, String versionIds, String methodCategory) {
 		// 校验资产库
 		boolean isActive = PALRepositoryQueryAPIManager.getInstance().isActiveWorkSpace(wsId);
 		if (!isActive) {
@@ -99,7 +101,7 @@ public class BatchWeb extends ActionWeb {
 		}
 		ResponseObject ro = ResponseObject.newOkResponse();
 		if (BatchConst.PROCESS_LIST.equals(type)) {
-			ro = new CreateProcessExcel().createProcessTemplate(uc, wsId);
+			ro = new CreateProcessExcel().createProcessTemplate(uc, wsId, methodCategory);
 		} else if (BatchConst.SHAPE_LIST.equals(type)) {
 			ro = new CreateShapeExcel().createShapeTemplate(uc, wsId, versionIds);
 		}
@@ -267,7 +269,7 @@ public class BatchWeb extends ActionWeb {
 	 * @param fileName
 	 * @return
 	 */
-	public String checkProcessData(String wsId, String teamId, String type, String fileValue, String fileName) {
+	public String checkProcessData(String wsId, String teamId, String type, String fileValue, String fileName, String methodCategory) {
 		DCPluginProfile dcProfile = DCProfileManager.getDCProfile(BatchConst.APP_ID, BatchConst.TMP);
 		DCContext dc = new DCContext(uc, dcProfile, BatchConst.APP_ID, BatchConst.UPLOAD, fileValue, fileName);
 		File file = new File(dc.getFilePath());
@@ -280,7 +282,7 @@ public class BatchWeb extends ActionWeb {
 			return ro.toString();
 		}
 		if ("processList".equals(type)) {// 流程清单校验
-			return new ValidProcessExcel(uc).checkProcessList(file, wsId).toString();
+			return new ValidProcessExcel(uc).checkProcessList(file, wsId, methodCategory).toString();
 		}
 		if ("shapeList".equals(type)) {// 模型结构上传
 			return new ValidShapeExcel().checkShapeList(uc, file, wsId, teamId).toString();
@@ -293,7 +295,7 @@ public class BatchWeb extends ActionWeb {
 	 * @param param
 	 * @return
 	 */
-	public String saveBatchCreateData(String param) {
+	public String saveBatchCreateData(String param, String methodCategory) {
 		JSONObject object = JSONObject.parseObject(param);
 		String type = object.getString("type");
 		String simpleLogName = "simpleCreate.log";
@@ -329,7 +331,7 @@ public class BatchWeb extends ActionWeb {
 		logPath = simpleLogFile.getPath();
 		
 		if ("processList".equals(type)) {// 流程清单保存
-			new Thread(()->{new ImportProcessExcel().execute(uc, object, simpleLogFile, fullLogFile, logId);}) .start();
+			new Thread(()->{new ImportProcessExcel().execute(uc, object, simpleLogFile, fullLogFile, logId, methodCategory);}) .start();
 		}
 		if ("shapeList".equals(type)) {// 模型结构保存
 			new Thread(()->{new ImportShapeExcel().execute(uc, object, simpleLogFile, fullLogFile, logId);}) .start();
@@ -354,9 +356,16 @@ public class BatchWeb extends ActionWeb {
 	public String queryBatchCreateLog(String type, String logId, String path, String timer) {
 		String content = "";
 		if (new File(path).exists()) {
+			if ("processList".equals(type)) {// 流程清单保存
+				if (LogRealTimeCountCache.getCache().get(logId) == null) {
+					timer = "";
+				}
+			} else if ("shapeList".equals(type)) {// 模型结构保存
 				if (BatchCache.getCache().get(logId) == null) {
 					timer = "";
 				}
+			}
+
 			content = LogUtil.getLogContent(new File(path));
 		}
 		ResponseObject ro = ResponseObject.newOkResponse();

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/CreateProcessExcel.java

@@ -5,8 +5,12 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import com.actionsoft.apps.coe.pal.constant.CoEConstant;
+import com.actionsoft.i18n.I18nRes;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -30,19 +34,22 @@ import com.actionsoft.bpms.util.UtilFile;
 
 public class CreateProcessExcel {
 
-	public  ResponseObject createProcessTemplate(UserContext uc, String wsId) {
+	public  ResponseObject createProcessTemplate(UserContext uc, String wsId, String methodCategory) {
 		// 获取当前资产库流程下的所有类别
-		List<String> categorys = ProcessUtil.getProcessCategory();
+		JSONObject methodObj = ProcessUtil.getCategoryMethods(methodCategory, true);
+		List<String> categorys = new ArrayList<>(methodObj.keySet());
+		Collections.sort(categorys);
 		ResponseObject ro = ResponseObject.newOkResponse();
-		ro.put("url", createExcelTemplate(uc, categorys));
+		ro.put("url", createExcelTemplate(uc, categorys, methodCategory));
 		return ro;
 	}
 	
 	/**
 	 * 创建Excel模版
 	 * @param categorys
+	 * @param methodCategory
 	 */
-	private String createExcelTemplate(UserContext uc, List<String> categorys) {
+	private String createExcelTemplate(UserContext uc, List<String> categorys, String methodCategory) {
 		String groupValue = "template";
 		String fileValue = UUIDGener.getUUID();
 		DCPluginProfile dcProfile = DCProfileManager.getDCProfile(BatchConst.APP_ID, BatchConst.TMP);
@@ -50,7 +57,8 @@ public class CreateProcessExcel {
 		UtilFile utilFile = new UtilFile(dcContext.getPath());
 		// 创建文件
 		utilFile.mkdirs();
-		File file = new File(utilFile + File.separator + BatchConst.PROCESS_LIST_TEMPLATE_FILE);
+		String excelName = I18nRes.findValue(CoEConstant.APP_ID, methodCategory) + BatchConst.PROCESS_LIST_TEMPLATE_FILE_SUFFIX;
+		File file = new File(utilFile + File.separator + excelName);
 		try {
 			file.createNewFile();
 		} catch (IOException e) {
@@ -58,8 +66,8 @@ public class CreateProcessExcel {
 		}
 		try {
 			XSSFWorkbook wb = new XSSFWorkbook();// 创建Excel工作簿对象
-			// 流程清单页签
+			// 模型清单页签
-			XSSFSheet sheet = wb.createSheet(ProcessConst.SHEET_NAME);// 创建工作表对象
+			XSSFSheet sheet = wb.createSheet(ProcessUtil.getModelListName(methodCategory));// 创建工作表对象
 			// 编号、名称、文件类型、描述/定义、责任部门、责任人、扩展<xxx>、...
 			XSSFRow titleRow = sheet.createRow(0);
 			titleRow.setHeightInPoints(25);
@@ -70,13 +78,13 @@ public class CreateProcessExcel {
 			List<XSSFCell> titleList = new ArrayList<>();
 			int index = 0;
 			//  编号
-			titleList.add(titleRow.createCell((short)index));
+//			titleList.add(titleRow.createCell((short)index));
-			titleList.get((short)index).setCellStyle(cellStyle);
+//			titleList.get((short)index).setCellStyle(cellStyle);
-			titleList.get((short)index).setCellValue(ProcessConst.TABLE_NO);
+//			titleList.get((short)index).setCellValue(ProcessConst.TABLE_NO);
-			sheet.setColumnWidth((short)index, 3000);// 设置当前列宽度
+//			sheet.setColumnWidth((short)index, 3000);// 设置当前列宽度
-			
+//
-			index++;
+//			index++;
-			
+//
 			// 名称
 			titleList.add(titleRow.createCell((short)index));
 			titleList.get((short)index).setCellStyle(cellStyle);
@@ -85,6 +93,14 @@ public class CreateProcessExcel {
 			
 			index++;
 
+			// 上级名称
+			titleList.add(titleRow.createCell((short)index));
+			titleList.get((short)index).setCellStyle(cellStyle);
+			titleList.get((short)index).setCellValue(ProcessConst.TABLE_PARENT_NAME);
+			sheet.setColumnWidth((short)index, 13000);// 设置当前列宽度
+
+			index++;
+			
 			// 文件类型
 			titleList.add(titleRow.createCell(index));
 			titleList.get((short)index).setCellStyle(cellStyle);
@@ -123,7 +139,7 @@ public class CreateProcessExcel {
 				}
 			}
 			// 增加说明页
-			File descFile = new File(BatchConst.TEMPLATE_FILE_PATH + BatchConst.PROCESS_LIST_TEMPLATE_FILE);
+			File descFile = new File(BatchConst.TEMPLATE_FILE_PATH + excelName);
 			if (descFile.exists()) {
 					XSSFWorkbook descWb;
 					try {

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java

@@ -3,34 +3,35 @@ package com.actionsoft.apps.coe.pal.batch.web.create.process;
 import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
 import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
+import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
+import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache;
+import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepositoryPropertyDao;
+import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
-import com.actionsoft.apps.coe.pal.yili.log.batch.cache.BatchCache;
+import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Cache.LogRealTimeCountCache;
+import com.actionsoft.apps.coe.pal.yili.log.datamigration.log.Model.LogRealTimeCountModel;
 import com.actionsoft.bpms.commons.security.logging.model.Level;
 import com.actionsoft.bpms.org.model.DepartmentModel;
 import com.actionsoft.bpms.org.model.RoleModel;
 import com.actionsoft.bpms.org.model.UserModel;
 import com.actionsoft.bpms.server.UserContext;
-import com.actionsoft.bpms.util.DBSql;
 import com.actionsoft.bpms.util.UUIDGener;
-import com.actionsoft.bpms.util.UtilString;
+import com.actionsoft.bpms.util.UtilDate;
+import com.actionsoft.i18n.I18nRes;
 import com.actionsoft.sdk.local.SDK;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -42,77 +43,116 @@ public class ImportProcessExcel {
 	
 	// 所有流程数据
 	private List<JSONObject> palList;
-	private long start;
+	private long startTime;
+	private long endTime;
 	private File simpleLogFile;
 	private File fullLogFile;
+	// private File successLogFile;// 成功简要日志
+	// private File matchErrImportFile;// 失败简要日志
 	private String logId;
 	private UserContext uc;
 
-	public void execute(UserContext uc, JSONObject object, File simpleLogFile, File fullLogFile, String logId) {
+	public void execute(UserContext uc, JSONObject object, File simpleLogFile, File fullLogFile, String logId, String methodCategory) {
 		this.fullLogFile = fullLogFile;
 		this.simpleLogFile = simpleLogFile;
+		// 单独创建一个成功日志
+//		successLogFile = new File(fullLogFile.getParentFile().getPath() + File.separator + BatchConst.IMPORT_LOG_FILE_SUCCESS);
+//		matchErrImportFile = new File(fullLogFile.getParentFile().getPath() + File.separator + BatchConst.IMPORT_LOG_FILE_MATCH_ERR);
+//		try {
+//			successLogFile.createNewFile();
+//			matchErrImportFile.createNewFile();
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
 		this.logId = logId;
-		this.start = System.currentTimeMillis();
+		this.startTime = System.currentTimeMillis();
 		this.uc = uc;
-		LogUtil.appendLog("PAL批量导入流程清单 Begin " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()), simpleLogFile, fullLogFile);
+		Timestamp startDate = new Timestamp(startTime);
+		LogUtil.appendLog("注：该日志文件存储简要日志信息", simpleLogFile);
+		LogUtil.appendLog("注：该日志文件存储详细日志信息", fullLogFile);
+
+		LogUtil.appendLog("\n[信息]操作人：" + uc.getUserName() + "<" + uc.getUID() + ">", simpleLogFile, fullLogFile);
+		LogUtil.appendLog("[信息]操作时间：" + UtilDate.datetimeFormat(startDate), simpleLogFile, fullLogFile);
+		// todo
+//		LogUtil.appendLog("[信息]模型文件：" + fileName, simpleLogFile, fullLogFile);
+//		LogUtil.appendLog("[信息]模型文件路径：" + filePath, simpleLogFile, fullLogFile);
+
+		LogUtil.appendLog("PAL批量导入模型清单 Begin " + UtilDate.datetimeFormat(startDate), simpleLogFile, fullLogFile);
 		LogUtil.appendLog("--------------------------------", simpleLogFile, fullLogFile);
+		LogUtil.appendLog("若模型（流程、表单、制度等各类模型）存在多版本，只与模型最新版本进行匹配，过往版本忽略不进行任何处理，若最新版本模型非可编辑状态（已发布、已停用、审批中），直接跳过该模型，不做任何调整", simpleLogFile, fullLogFile);
+
 		String wsId = object.getString("wsId");
 		JSONObject data = object.getJSONObject("data");
 		JSONArray importData = data.getJSONArray("okData");
-
+		// 排序(按照从小到大排序)
-		palList = assemblePalData(wsId);
+		importData.sort((c1, c2)-> {
-		LogUtil.appendLog("导入数据按照编号排序[开始]", fullLogFile);
+			JSONObject o1 = (JSONObject) c1;
-		// 数据进行排序
+			JSONObject o2 = (JSONObject) c2;
-		importData = sort(importData);
+			JSONArray pathArr1 = o1.getJSONArray("pathIdArr");
-		LogUtil.appendLog("导入数据按照编号排序[完成]", fullLogFile);
+			JSONArray patharr2 = o2.getJSONArray("pathIdArr");
+			if (pathArr1.size() == patharr2.size()) {// 按excel顺序导入
+				return o1.getIntValue("excelNo") - o2.getIntValue("excelNo");
+			} else {
+				return pathArr1.size() - patharr2.size();
+			}
+		});
+		palList = assemblePalData(wsId, methodCategory);
 		// 放入cache
-		BatchCache.getCache().put(logId, importData.size(), true);
+		LogRealTimeCountModel countModel = new LogRealTimeCountModel();
-		// 获取文件分类
+		countModel.setTotalCount(importData.size());
-		Map<String, String> map = ProcessUtil.getProcessCategoryMethod();
+		countModel.setSuccessCount(0);
-		// 获取每个文件分类的属性范围
+		LogRealTimeCountCache.getCache().put(logId, countModel, true);
-		List<List<PALRepositoryModel>> palData = new ArrayList<List<PALRepositoryModel>>();
+
-		List<List<PALRepositoryPropertyModel>> propertyData = new ArrayList<List<PALRepositoryPropertyModel>>();
-		List<List<DesignerShapeRelationModel>> relationData = new ArrayList<List<DesignerShapeRelationModel>>();
 		// 扩展属性配置Map记录,最后插入特性配置表，key：methodId，value：{id：processId，value：attributeValue}
 		Map<String, JSONObject> attrConfMap = new HashMap<>();
-		LogUtil.appendLog("准备流程数据[开始]", fullLogFile);
+
+
+
+		PALRepository repository =  CoeProcessLevelDaoFacotory.createCoeProcessLevel();
+		PALRepositoryPropertyDao propertyDao = new PALRepositoryPropertyDao();
+		DesignerShapeRelationDao relationDao = new DesignerShapeRelationDao();
+
+
+		LogUtil.appendLog("准备导入" + I18nRes.findValue(CoEConstant.APP_ID, methodCategory) + "数据[开始]", fullLogFile);
+		try {
 			for (int i = 0; i < importData.size(); i++) {
-			List<PALRepositoryModel> palList = new ArrayList<>();
 				PALRepositoryModel palModel = null;
+				// 修改属性记录(记录删除的文件属性和关联属性内容）
+				List<PALRepositoryPropertyModel> delPropertyList = new ArrayList<>();
+				List<DesignerShapeRelationModel> delRelationList = new ArrayList<>();
 				// 单个流程属性配置
 				List<PALRepositoryPropertyModel> palPropertyList = new ArrayList<>();
 				// 流程关联属性结果集
 				List<DesignerShapeRelationModel> relationList = new ArrayList<>();
-			JSONArray rowData = importData.getJSONArray(i);
+
-			// 获取固定属性
+				JSONObject currImport = importData.getJSONObject(i);
-			String plId = UUIDGener.getUUID();
+				String plId = currImport.getString("id");
-			String plRid = UUIDGener.getUUID();
+				String parentId = currImport.getString("parentId");
+				String methodId = currImport.getString("methodId");
+				String result = currImport.getString("result");// add 新增，update 已存在 更新
+				JSONArray rowArr = currImport.getJSONArray("row");
+
+				if ("add".equals(result)) {// 新增
+					String parentVerId = getVerIdById(parentId);
 					int level = 0;
 					int orderIndex = 0;
-			String parentId = "";
-			String versionId = plId;
-			int version = 1;
-			String no = "";
 					String name = "";
-			String category = "process";
+					String category = methodCategory;
-			String methodId = "";
+					int version = 1;
 					Timestamp timestamp = new Timestamp(System.currentTimeMillis());
 					JSONObject methodAttrs = null;
-			String excelNo = "";
+					for (int j = 0; j < rowArr.size(); j++) {
-			for (int j = 0; j < rowData.size(); j++) {
+						JSONObject cellData = rowArr.getJSONObject(j);
-				JSONObject cellData = rowData.getJSONObject(j);
+						if (j == 0) {// 文件名称
-				if (j == 0) {// 编号
-					excelNo = cellData.getString("value");
-				} else if (j == 1) {// 名称
 							name = cellData.getString("value");
-					LogUtil.appendLog("流程名称： " + name, fullLogFile);
 							// level，orderIndex，parentId
-					JSONObject object2 = getPosition(plId, excelNo, cellData.getString("value"));
+							JSONObject object2 = getPosition(plId, parentId, cellData.getString("value"));
 							level = object2.getIntValue("level");
 							orderIndex = object2.getIntValue("orderIndex");
-					parentId = object2.getString("parentId");
+						} else if (j == 1) {// 上级名称
+
 						} else if (j == 2) {// 文件类型
-					methodId = map.get(cellData.getString("value"));
+							// methodId已有
 							LogUtil.appendLog("流程类型： " + cellData.getString("value"), fullLogFile);
 							if (!"default".equals(methodId)) {
 								methodAttrs = ProcessUtil.getProcessMethodAttr(wsId, methodId);
@@ -281,103 +321,417 @@ public class ImportProcessExcel {
 									palPropertyList.add(property);
 								}
 							}
-					LogUtil.appendLog("扩展属性<" + cellData.getString("name") + ">： " + cellData.getString("value"), fullLogFile);
 						}
 					}
-			palModel = CoeProcessLevelUtil.createPALRepositoryModel(plId, plRid, wsId, name, no, orderIndex, parentId, category, true, version, versionId, false, methodId, "0", level, "", "", uc.getUID(), uc.getUID(), timestamp, "", "", "", "", null, "", "", "", "", null);
+					palModel = CoeProcessLevelUtil.createPALRepositoryModel(plId, UUIDGener.getUUID(), wsId, name, "", orderIndex, parentVerId, category, true, version, plId, false, methodId, "0", level, "", "", uc.getUID(), uc.getUID(), timestamp, "", "", "", "", null, "", "", "", "", null);
-			palList.add(palModel);
+
-			palData.add(palList);
+					// 扩展属性默认配置
-			propertyData.add(palPropertyList);
+					getAttriConfig(attrConfMap, palModel, palPropertyList);
-			relationData.add(relationList);
+				} else {// update 更新
+					palModel = PALRepositoryCache.getCache().get(plId);
+					String name = "";
+					JSONObject methodAttrs = null;
+					for (int j = 0; j < rowArr.size(); j++) {
+						JSONObject cellData = rowArr.getJSONObject(j);
+						if (j == 0) {// 文件名称
+							name = cellData.getString("value");
+						} else if (j == 1) {// 上级名称
+
+						} else if (j == 2) {// 文件类型
+							// methodId已有
+							LogUtil.appendLog("流程类型： " + cellData.getString("value"), fullLogFile);
+							if (!"default".equals(methodId)) {
+								methodAttrs = ProcessUtil.getProcessMethodAttr(wsId, methodId);
+							}
+						} else {// 扩展属性
+							if (!"default".equals(methodId)) {// 自定义扩展属性
+								if (methodAttrs.containsKey(cellData.getString("name"))) {
+									JSONObject attr = methodAttrs.getJSONObject(cellData.getString("name"));
+									String ref = attr.getString("ref");
+									String attrId = attr.getString("id");
+									String type = attr.getString("type");
+									String groupPath = attr.getString("groupPath");
+									String attrName = attr.getString("title");
+									String attrValue = "";
+									PALRepositoryPropertyModel property = new PALRepositoryPropertyModel();
+									property.setId(UUIDGener.getUUID());
+									property.setOrderIndex(0);
+									property.setPlId(plId);
+									property.setPropertyId(attrId);
+									property.setPropertyName(attrName);
+
+									// 记录需要删除的文件属性
+									List<PALRepositoryPropertyModel> removeProps = propertyDao.getPropertysByPlid(plId, attrId);
+									if (removeProps.size() > 0) {
+										delPropertyList.addAll(removeProps);// 记录需要删除的文件属性配置
+									}
+									// 记录需要删除的关联属性
+									List<DesignerShapeRelationModel> removeRelations = relationDao.query(plId, "", attrId, null, null);
+									if (removeRelations.size() > 0) {
+										delRelationList.addAll(removeRelations);
+									}
+
+									if ("string".equals(type) || "textarea".equals(type)) {
+										attrValue = cellData.getString("value");
+										property.setPropertyValue(attrValue);
+									} else if ("relation".equals(type)) {
+										JSONObject object2 = new JSONObject();
+										object2.put("relationShapeId", "");
+										object2.put("shapeId", "");
+										object2.put("attrId", attrId);
+										object2.put("shapeText", "");
+										object2.put("relationFileId", "000");
+										object2.put("relationShapeText", "");
+										object2.put("groupPath", groupPath);
+										object2.put("fileId", "");
+										property.setPropertyValue(object2.toString());
+										JSONObject refObj = JSONObject.parseObject(ref);
+										String relationType = refObj.getString("type");// 关联范围 file shape
+										JSONArray relations = cellData.getJSONObject("attr").getJSONArray("relations");
+										if ("file".equals(relationType)) {// 前后置流程
+											for (Object relation : relations) {
+												JSONObject obj = JSONObject.parseObject(relation.toString());
+												DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+												model.setFileId(plId);
+												model.setAttrId(attrId);
+												model.setId(UUIDGener.getUUID());
+												model.setShapeId("");
+												model.setShapeText("");
+												model.setRelationFileId(obj.getString("versionId"));
+												model.setRelationShapeId("");
+												model.setRelationShapeText(obj.getString("name"));
+												relationList.add(model);
+											}
+										} else {// 关联形状属性
+											for (Object relation : relations) {
+												JSONObject obj = JSONObject.parseObject(relation.toString());
+												DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+												model.setFileId(plId);
+												model.setAttrId(attrId);
+												model.setId(UUIDGener.getUUID());
+												model.setShapeId("");
+												model.setShapeText("");
+												model.setRelationFileId(obj.getString("fileId"));
+												model.setRelationShapeId(obj.getString("shapeId"));
+												model.setRelationShapeText(obj.getString("shapeText"));
+												relationList.add(model);
+											}
+										}
+									}  else if ("awsorg".equals(type)) {// 关联aws的组织架构
+										JSONObject object3 = cellData.getJSONObject("data");
+										JSONArray deptArr = object3.getJSONArray("department");// 部门
+										JSONArray roleArr = object3.getJSONArray("role");// 角色
+										JSONArray positionArr = object3.getJSONArray("position");// 岗位
+										JSONArray userArr = object3.getJSONArray("user");// 人员
+										// 部门
+										for (int l = 0; l < deptArr.size(); l++) {
+											String deptId = deptArr.getString(l);
+											DepartmentModel deptModel = SDK.getORGAPI().getDepartmentById(deptId);
+											if (deptModel == null) {
+												continue;
+											}
+											JSONObject deptObj = new JSONObject();
+											deptObj.put("name", deptModel.getName());
+											deptObj.put("id", deptId);
+											deptObj.put("type", "department");
+											DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+											model.setFileId(plId);
+											model.setAttrId(attrId);
+											model.setId(UUIDGener.getUUID());
+											model.setShapeId("");
+											model.setShapeText("");
+											model.setRelationFileId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeText(deptObj.toString());
+											relationList.add(model);
+										}
+										// 角色
+										for (int l = 0; l < roleArr.size(); l++) {
+											String roleId = roleArr.getString(l);
+											RoleModel roleModel = SDK.getORGAPI().getRoleById(roleId);
+											if (roleModel == null) {
+												continue;
+											}
+											JSONObject roleObj = new JSONObject();
+											roleObj.put("name", roleModel.getName());
+											roleObj.put("id", roleId);
+											roleObj.put("type", "role");
+											DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+											model.setFileId(plId);
+											model.setAttrId(attrId);
+											model.setId(UUIDGener.getUUID());
+											model.setShapeId("");
+											model.setShapeText("");
+											model.setRelationFileId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeText(roleObj.toString());
+											relationList.add(model);
+										}
+										// 岗位
+										for (int l = 0; l < positionArr.size(); l++) {
+											String positionId = positionArr.getString(l);
+											RoleModel positionModel = SDK.getORGAPI().getRoleById(positionId);
+											if (positionModel == null) {
+												continue;
+											}
+											JSONObject positionObj = new JSONObject();
+											positionObj.put("name", positionModel.getName());
+											positionObj.put("id", positionId);
+											positionObj.put("type", "position");
+											DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+											model.setFileId(plId);
+											model.setAttrId(attrId);
+											model.setId(UUIDGener.getUUID());
+											model.setShapeId("");
+											model.setShapeText("");
+											model.setRelationFileId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeText(positionObj.toString());
+											relationList.add(model);
+										}
+										// 成员
+										for (int l = 0; l < userArr.size(); l++) {
+											String userId = userArr.getString(l);
+											UserModel userModel = SDK.getORGAPI().getUser(userId);
+											if (userModel == null) {
+												continue;
+											}
+											JSONObject roleObj = new JSONObject();
+											roleObj.put("name", userModel.getUserName());
+											roleObj.put("id", userId);
+											roleObj.put("type", "user");
+											DesignerShapeRelationModel model = new DesignerShapeRelationModel();
+											model.setFileId(plId);
+											model.setAttrId(attrId);
+											model.setId(UUIDGener.getUUID());
+											model.setShapeId("");
+											model.setShapeText("");
+											model.setRelationFileId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeId("00000000-0000-0000-0000-000000000000");
+											model.setRelationShapeText(roleObj.toString());
+											relationList.add(model);
+										}
+									} else {
+										attrValue = cellData.getString("value");
+										property.setPropertyValue(attrValue);
+									}
+									palPropertyList.add(property);
+								}
+							}
+						}
+					}
 					// 扩展属性默认配置
 					getAttriConfig(attrConfMap, palModel, palPropertyList);
 				}
-		LogUtil.appendLog("获取[文件属性]更多特性的标准配置信息：" + JSON.toJSONString(attrConfMap), fullLogFile);
+				// 批量更新
-		LogUtil.appendLog("准备流程数据[完成]", fullLogFile);
+				batchOpData(repository, propertyDao, relationDao, result, palModel, palPropertyList, relationList, delPropertyList, delRelationList, i+1, importData.size());
-		batchInsert(palData, propertyData, relationData, attrConfMap);// 保存数据
 			}
 
-	private void batchInsert(List<List<PALRepositoryModel>> palData, List<List<PALRepositoryPropertyModel>> propertyData, List<List<DesignerShapeRelationModel>> relationData, Map<String, JSONObject> attrConfMap) {
+			endTime = System.currentTimeMillis();
-		PALRepository palDao = new PALRepository();
+			Timestamp endDate = new Timestamp(endTime);
-		PALRepositoryPropertyDao propertyDao = new PALRepositoryPropertyDao();
+			LogRealTimeCountModel model = LogRealTimeCountCache.getCache().get(logId);
-		DesignerShapeRelationDao relationDao = new DesignerShapeRelationDao();
+			String takeTimeText = takeTime(endTime, startTime);
-		Connection conn = DBSql.open();
+			String resultMsg = "导入完成，总耗时" + takeTimeText + "，模型清单总共[" + model.getTotalCount() + "],导入成功[" + model.getSuccessCount() + "]条，导入失败[" + (model.getTotalCount() - model.getSuccessCount())
-		PreparedStatement prest = null;
+					+ "]条）";
-		try {
+
-			conn.setAutoCommit(false);
+			LogUtil.appendLog("\n" + BatchConst.LOG_END + resultMsg, simpleLogFile, fullLogFile);
-			for (int i = 0; i < palData.size(); i++) {
+			LogUtil.appendLog("\n" + "PAL批量导入模型清单 End " + UtilDate.datetimeFormat(endDate), simpleLogFile, fullLogFile);
-				List<PALRepositoryModel> palList = palData.get(i);
-				List<PALRepositoryPropertyModel> palPropertyList = propertyData.get(i);
-				List<DesignerShapeRelationModel> relationList = relationData.get(i);
-				// 获取路径名称
-				String namePath = getFileNamePath(palList.get(0));
-				LogUtil.appendLog("流程定义数据存储数据库[开始]", fullLogFile);
-				/**PAL流程信息**/
-				palDao.batchInsert(conn, prest, palList);
-				LogUtil.appendLog("data:" + JSON.toJSONString(palList), fullLogFile);
-				LogUtil.appendLog("流程定义数据存储数据库[完成]", fullLogFile);
-				/**PAL文件属性配置**/
-				LogUtil.appendLog("流程文件属性配置存储数据库[开始]", fullLogFile);
-				propertyDao.batchInsert(conn, prest, palPropertyList);
-				LogUtil.appendLog("data:" + JSON.toJSONString(palPropertyList), fullLogFile);
-				LogUtil.appendLog("流程文件属性配置存储数据库[完成]", fullLogFile);
-				/**PAL文件关联属性**/
-				LogUtil.appendLog("流程文件关联属性存储数据库[开始]", fullLogFile);
-				relationDao.batchInsert(conn, prest, relationList);
-				LogUtil.appendLog("data:" + JSON.toJSONString(relationList), fullLogFile);
-				LogUtil.appendLog("流程文件关联属性存储数据库[完成]", fullLogFile);
-				if (BatchCache.getCache().get(logId) != null) {
-					BatchCache.getCache().put(logId, BatchCache.getCache().get(logId) - 1);
-				}
-				LogUtil.appendLog(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " 导入 " + namePath + " 新建成功", simpleLogFile, fullLogFile);
-			}
-			conn.commit();
-			conn.setAutoCommit(true);
-			// 刷新缓存
-			LogUtil.appendLog("刷新流程相关缓存[开始]", fullLogFile);
-			for (int i = 0; i < palData.size(); i++) {
-				List<PALRepositoryModel> palList = palData.get(i);
-				List<PALRepositoryPropertyModel> palPropertyList = propertyData.get(i);
-				List<DesignerShapeRelationModel> relationList = relationData.get(i);
-				palDao.refreshCache(palList);
-				propertyDao.refreshCache(palPropertyList);
-				relationDao.refreshCache(relationList);
-			}
-			LogUtil.appendLog("刷新流程相关缓存[完成]", fullLogFile);
-			long time = System.currentTimeMillis() - start;
-			String timeMsg = "";
-			if (time > 1000) {
-				timeMsg = (time / 1000) + " 秒";
-			} else {
-				timeMsg = time + " 毫秒";
-			}
-			LogUtil.appendLog("\nPAL批量导入流程清单 End " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " 总耗时 " + timeMsg, simpleLogFile, fullLogFile);
 			LogUtil.appendLog("--------------------------------", simpleLogFile, fullLogFile);
 			LogUtil.appendLog(BatchConst.END_LOG, simpleLogFile, fullLogFile);
 			// 插入审计日志
 			LogUtil.recordAuditLog(uc, "create", SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单", "详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath(), Level.INFO);
 			SDK.getLogAPI().consoleInfo(SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单[成功]，详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath());
-			// 添加资产库扩展属性的全局配置信息，直接调用coe api方法，通过新建立线程后台完成（不统计在上传流程清单耗费时间之内）
+			LogRealTimeCountCache.getCache().remove(logId);
-			// insertAttrConfig(attrConfMap);
+		} catch (Exception e) {
-		} catch (SQLException e) {
+			e.printStackTrace();
-			e.printStackTrace(System.err);
+			// 记录结束日志
-			LogUtil.appendLog("导入异常:" + LogUtil.getStackTrace(e), simpleLogFile, fullLogFile);
+			endTime = System.currentTimeMillis();
-			// 插入审计日志
+			Timestamp endDate = new Timestamp(endTime);
-			LogUtil.recordAuditLog(uc, "create", SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单", "详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath(), Level.ERROR);
+			LogRealTimeCountModel model = LogRealTimeCountCache.getCache().get(logId);
-			SDK.getLogAPI().consoleErr(SDK.getAppAPI().getAppContext(BatchConst.APP_ID).getNameI18N() + "：批量创建流程清单[失败]，详细日志见服务器以下路径中日志文件：" + simpleLogFile.getPath());
+			String takeTimeText = takeTime(endTime, startTime);
+			String resultMsg = "导入完成，总耗时" + takeTimeText + "，模型清单总共[" + model.getTotalCount() + "],导入成功[" + model.getSuccessCount() + "]条，导入失败[" + (model.getTotalCount() - model.getSuccessCount())
+					+ "]条）";
+			LogUtil.appendLog(BatchConst.LOG_ERROR + resultMsg, simpleLogFile, fullLogFile);
+			LogUtil.appendLog(BatchConst.END_LOG, simpleLogFile, fullLogFile);
+			LogRealTimeCountCache.getCache().remove(logId);
+
+		}
+		// 属性和关联属性缓存重新刷新
+		PALRepositoryPropertyCache.getCache().reload();
+		DesignerShapeRelationCache.getCache().reload();
+	}
+
+	/**
+	 * 计算使用时间
+	 * @param endTime
+	 * @param startTime
+	 * @return
+	 */
+	private String takeTime(long endTime, long startTime) {
+		long time = endTime - startTime;
+		String timeMsg = "";
+		if (time > 1000 * 60) {
+			timeMsg = "[" + (time / 1000 / 60) + "]分钟";
+		} else if (time > 1000) {
+			timeMsg = "[" + (time / 1000) + "]秒";
+		} else {
+			timeMsg = "[" + time + "]毫秒";
+		}
+		return timeMsg;
+	}
+
+
+	private void batchOpData(PALRepository repository, PALRepositoryPropertyDao propertyDao, DesignerShapeRelationDao relationDao, String type,
+							 PALRepositoryModel palModel, List<PALRepositoryPropertyModel> propertyModelList, List<DesignerShapeRelationModel> relationModelList, List<PALRepositoryPropertyModel> delPropertyIdList, List<DesignerShapeRelationModel> delRelationIdList, int importingCount, int totalCount) {
+		LogUtil.appendLog("\n************[执行进度]当前执行第[" + importingCount + "]条，共["+ totalCount +"]条************", simpleLogFile, fullLogFile);
+		if ("add".equals(type)) {// 新增
+			LogUtil.appendLog(BatchConst.LOG_START + "[执行阶段][创建模型阶段]创建模型" + I18nRes.findValue(CoEConstant.APP_ID, palModel.getMethodId()) + "[" + palModel.getName() + "]模型，模型ID[" + palModel.getId() + "]", simpleLogFile, fullLogFile);
+			String namePath = getFileNamePath(palModel);
+			LogUtil.appendLog(BatchConst.LOG_DESC + "模型所属路径[" + namePath + "]", simpleLogFile, fullLogFile);
+			LogUtil.appendLog(BatchConst.LOG_START + "创建PAL" + I18nRes.findValue(CoEConstant.APP_ID, palModel.getMethodId()) + "[" + palModel.getName() + "]模型，模型ID[" + palModel.getId() + "]", simpleLogFile, fullLogFile);
+			int index = repository.insert(palModel);
+			if (index > 0) {
+				LogUtil.appendLog(BatchConst.LOG_END + "创建PAL" + I18nRes.findValue(CoEConstant.APP_ID, palModel.getMethodId()) + "[" + palModel.getName() + "]模型，模型ID[" + palModel.getId() + "]", simpleLogFile, fullLogFile);
+			} else {
+				// 创建失败，直接返回，执行下一个流程，不记录成功记录
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "创建PAL" + I18nRes.findValue(CoEConstant.APP_ID, palModel.getMethodId()) + "[" + palModel.getName() + "]模型，模型ID[" + palModel.getId() + "]", simpleLogFile, fullLogFile);
+				return;
+			}
+			if (propertyModelList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "新增文件属性内容", simpleLogFile, fullLogFile);
+				boolean insertProps = propertyDao.batchInsert(propertyModelList);
+				if (insertProps) {
+					for (int i = 0; i < propertyModelList.size(); i++) {
+						String name = propertyModelList.get(i).getPropertyName();
+						String value = propertyModelList.get(i).getPropertyValue();
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "文件属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
+					}
+					LogUtil.appendLog(BatchConst.LOG_END + "新增文件属性内容，总共新增[" + propertyModelList.size() + "]条", simpleLogFile, fullLogFile);
+
+				} else {
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
+				}
+			}
+
+			if (relationModelList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性关联属性内容忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "新增文件属性内容", simpleLogFile, fullLogFile);
+				boolean insertProps = relationDao.barchInsert(relationModelList);
+				if (insertProps) {
+					for (int i = 0; i < relationModelList.size(); i++) {
+						String name = relationModelList.get(i).getAttrId();
+						String value = relationModelList.get(i).toString();
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "文件属性关联属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
+					}
+					LogUtil.appendLog(BatchConst.LOG_END + "新增文件属性关联属性内容，总共新增[" + relationModelList.size() + "]条", simpleLogFile, fullLogFile);
+
+				} else {
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性关联属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
+				}
+			}
+			// 更新其他自定义属性
+			LogUtil.appendLog(BatchConst.LOG_START + "完善其他自定义属性配置", simpleLogFile, fullLogFile);
+			PALRepositoryAPIManager.getInstance().updateRepositoryProperty(palModel.getId());
+			LogUtil.appendLog(BatchConst.LOG_END + "完善其他自定义属性配置", simpleLogFile, fullLogFile);
+
+			LogUtil.appendLog(BatchConst.LOG_END + "[执行阶段][创建模型阶段]", simpleLogFile, fullLogFile);
+		} else {// 更新
+			String namePath = getFileNamePath(palModel);
+
+			LogUtil.appendLog(BatchConst.LOG_START + "[执行阶段][更新模型阶段]更新模型" + I18nRes.findValue(CoEConstant.APP_ID, palModel.getMethodId()) + "[" + palModel.getName() + "]模型，模型ID[" + palModel.getId() + "]", simpleLogFile, fullLogFile);
+
+			LogUtil.appendLog(BatchConst.LOG_DESC + "模型所属路径[" + namePath + "]", simpleLogFile, fullLogFile);
+
+			if (propertyModelList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "新增文件属性内容", simpleLogFile, fullLogFile);
+				boolean insertProps = propertyDao.batchInsert(propertyModelList);
+				if (insertProps) {
+					for (int i = 0; i < propertyModelList.size(); i++) {
+						String name = propertyModelList.get(i).getPropertyName();
+						String value = propertyModelList.get(i).getPropertyValue();
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "文件属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
+					}
+					LogUtil.appendLog(BatchConst.LOG_END + "新增文件属性内容，总共新增[" + propertyModelList.size() + "]条", simpleLogFile, fullLogFile);
+
+				} else {
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
+				}
+			}
+
+			if (relationModelList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性关联属性内容忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "新增文件属性内容", simpleLogFile, fullLogFile);
+				boolean insertProps = relationDao.barchInsert(relationModelList);
+				if (insertProps) {
+					for (int i = 0; i < relationModelList.size(); i++) {
+						String name = relationModelList.get(i).getAttrId();
+						String value = relationModelList.get(i).toString();
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "文件属性关联属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
+					}
+					LogUtil.appendLog(BatchConst.LOG_END + "新增文件属性关联属性内容，总共新增[" + relationModelList.size() + "]条", simpleLogFile, fullLogFile);
+
+				} else {
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "新增文件属性关联属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
+				}
+			}
+
+			// 删除原有数据
+			if (delPropertyIdList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "删除原有文件属性忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "删除原有文件属性内容", simpleLogFile, fullLogFile);
 				try {
-				conn.rollback();
+					propertyDao.batchDeletePropListById(delPropertyIdList);
-				conn.setAutoCommit(true);
+					for (int i = 0; i < delPropertyIdList.size(); i++) {
-				DBSql.close(conn, prest, null);
+						String name = delPropertyIdList.get(i).getPropertyName();
-			} catch (SQLException e1) {
+						String value = delPropertyIdList.get(i).getPropertyValue();
-				e1.printStackTrace(System.err);
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "删除原有文件属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
 					}
-		} finally {
+					LogUtil.appendLog(BatchConst.LOG_END + "删除原有文件属性内容，总共删除[" + delPropertyIdList.size() + "]条", simpleLogFile, fullLogFile);
-			DBSql.close(conn, prest, null);
+				} catch (SQLException e) {
-			if (BatchCache.getCache().get(logId) != null) {
+					e.printStackTrace();
-				BatchCache.getCache().remove(logId);
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "删除原有文件属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
 				}
 			}
+
+			if (delRelationIdList.size() == 0) {
+				LogUtil.appendLog(BatchConst.LOG_WARNING + "删除原有文件属性关联属性内容忽略", simpleLogFile, fullLogFile);
+			} else {
+				LogUtil.appendLog(BatchConst.LOG_START + "删除原有文件属性内容", simpleLogFile, fullLogFile);
+				try {
+					relationDao.batchDeleteRelationListById(delRelationIdList);
+					for (int i = 0; i < delRelationIdList.size(); i++) {
+						String name = delRelationIdList.get(i).getAttrId();
+						String value = delRelationIdList.get(i).toString();
+
+						LogUtil.appendLog(BatchConst.LOG_DESC + "删除原有属性关联属性内容[" + name + "]，属性内容值为[" + value +  "]", simpleLogFile, fullLogFile);
+					}
+					LogUtil.appendLog(BatchConst.LOG_END + "删除原有文件属性关联属性内容，总共删除[" + delRelationIdList.size() + "]条", simpleLogFile, fullLogFile);
+				} catch (SQLException e) {
+					e.printStackTrace();
+					LogUtil.appendLog(BatchConst.LOG_WARNING + "删除原有文件属性关联属性内容失败，详情查看BPM平台运行日志", simpleLogFile, fullLogFile);
+				}
+			}
+			// 更新其他自定义属性
+			LogUtil.appendLog(BatchConst.LOG_START + "完善其他自定义属性配置", simpleLogFile, fullLogFile);
+			PALRepositoryAPIManager.getInstance().updateRepositoryProperty(palModel.getId());
+			LogUtil.appendLog(BatchConst.LOG_END + "完善其他自定义属性配置", simpleLogFile, fullLogFile);
+
+			LogUtil.appendLog(BatchConst.LOG_END + "[执行阶段][更新模型阶段]", simpleLogFile, fullLogFile);
+		}
+		// 记录成功日志记录
+		LogRealTimeCountCache.getCache().get(logId).setSuccessCount(LogRealTimeCountCache.getCache().get(logId).getSuccessCount() + 1);
 	}
 
 	/**
@@ -492,14 +846,21 @@ public class ImportProcessExcel {
 		}
 	}
 
-	private List<JSONObject> assemblePalData(String wsId) {
+	private String getVerIdById(String parentId) {
-		// 获取所有流程
+		for (JSONObject obj : palList) {
-		Set<String> ids = new HashSet<>();
+			if (obj.getString("id").equals(parentId) || obj.getString("versionId").equals(parentId)) {
-		List<PALRepositoryModel> allPalList = new ArrayList<>();
+				return obj.getString("versionId");
-		PALRepositoryCache.getAllChildrenModelsByPid(wsId, "process", allPalList, ids);
+			}
+		}
+		return "错误";
+	}
+
+	private List<JSONObject> assemblePalData(String wsId, String methodCategory) {
+		// 获取指定根目录下所有的最新版本模型列表
+		List<PALRepositoryModel> recentVerList = ProcessUtil.getRecentRepositoryList(wsId, methodCategory);
 		// 拼接数据
 		List<JSONObject> list = new ArrayList<JSONObject>();
-		for (PALRepositoryModel model : allPalList) {
+		for (PALRepositoryModel model : recentVerList) {
 			JSONObject tmp = new JSONObject();
 			tmp.put("id", model.getId());
 			tmp.put("name", model.getName());
@@ -510,91 +871,47 @@ public class ImportProcessExcel {
 			tmp.put("versionId", model.getVersionId());
 			list.add(tmp);
 		}
+		// 加入根节点
+		JSONObject tmp = new JSONObject();
+		tmp.put("id", methodCategory);
+		tmp.put("name", I18nRes.findValue(CoEConstant.APP_ID, methodCategory));
+		tmp.put("parentId", "-1");
+		tmp.put("isUse", true);
+		tmp.put("level", 0);
+		tmp.put("orderIndex", 0);
+		tmp.put("versionId", methodCategory);
+		list.add(tmp);
 		return list;
 	}
 
 	/**
-	 * 获取子节点
+	 * 计算所在的层级和排序位置
-	 * @param pid
-	 * @return
-	 */
-	private List<JSONObject> getAllSubModelsByPid(String pid) {
-		List<JSONObject> result = new ArrayList<>();
-		if (UtilString.isEmpty(pid)) {
-			return result;
-		}
-		if (pid.length() < 36) {
-			for (JSONObject obj : palList) {
-				if (pid.equals(obj.getString("parentId"))) {
-					result.add(obj);
-				}
-			}
-		} else {
-			// 找出pid的model
-			Set<String> versionIds = new HashSet<>();
-			for (JSONObject obj : palList) {
-				if (obj.getString("parentId").equals(pid)) {
-					versionIds.add(obj.getString("versionId"));
-				}
-			}
-			if (versionIds.size() > 0) {
-				for (JSONObject obj : palList) {
-					if (versionIds.contains(obj.getString("versionId"))) {
-						result.add(obj);
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 计算Excel中编号所在的位置
 	 * @param plId
-	 * @param noStr
+	 * @param parentId
 	 * @param name
 	 * @return
 	 */
-	private JSONObject getPosition(String plId, String noStr, String name) {
+	private JSONObject getPosition(String plId, String parentId, String name) {
 		JSONObject result = new JSONObject();
-		int level = 1;
+		int level;
-		int orderIndex = 1;
+		int orderIndex = 0;
-		String parentId = "";
+		// 查询父节点
-		String [] noArr = noStr.split("\\.");// 编号拆分
+		JSONObject parentObj = null;
-		String pid = "process";// 从分类节点往下对比
+		for (JSONObject obj : palList) {
-		for (int i = 1; i < noArr.length + 1; i++) {
+			if (obj.getString("id").equals(parentId) || obj.getString("versionId").equals(parentId)) {
-			int currNo = Integer.parseInt(noArr[i - 1]);// 当前编号
+				parentObj = obj;
-			int currLevel = i;// 当前层级
-			// 获取当前pid下的所有第一层级子节点
-			List<JSONObject> list = getAllSubModelsByPid(pid);
-			if (list == null || list.size() == 0) {
-				level = currLevel;
-				orderIndex = 1;// 第一个默认置1
-				parentId = pid;
-				break;
-			}
-			// 有子节点
-			// 找到子节点中的最大OrderIndex
-			int maxOrderIndex = 1;
-			for (JSONObject model : list) {
-				if (model.getBooleanValue("isUse")) {
-					maxOrderIndex = maxOrderIndex >= model.getIntValue("orderIndex") ? maxOrderIndex : model.getIntValue("orderIndex");
-				}
-			}
-			if (currNo > maxOrderIndex || i == noArr.length) {// 当前超出最大编号或者已经查询到底，不再查询
-				level = currLevel;
-				orderIndex = ++maxOrderIndex;
-				parentId = pid;
-				break;
-			} else {
-				for (JSONObject model : list) {
-					if (model.getBooleanValue("isUse") && model.getIntValue("orderIndex") == currNo) {
-						pid = model.getString("id");
 				break;
 			}
 		}
+		level = parentObj.getIntValue("level") + 1;
+		// 查询父节点下所有子节点
+		for (JSONObject obj : palList) {
+			if (obj.getString("parentId").equals(parentId)) {
+				orderIndex = orderIndex > obj.getIntValue("orderIndex") ? orderIndex : obj.getIntValue("orderIndex");
+
 			}
 		}
+		orderIndex++;
 		result.put("level", level);
 		result.put("orderIndex", orderIndex);
 		result.put("parentId", parentId);
@@ -612,32 +929,4 @@ public class ImportProcessExcel {
 		return result;
 	}
 
-	/**
-	 * 排序
-	 * @param array
-	 * @return
-	 */
-	private JSONArray sort(JSONArray array) {
-		List<JSONArray> list = JSONObject.parseArray(array.toJSONString(), JSONArray.class);
-		Collections.sort(list, new Comparator<JSONArray>() {
-
-			@Override
-			public int compare(JSONArray o1, JSONArray o2) {
-				String [] no1 = o1.getJSONObject(0).getString("value").split("\\.");
-				String [] no2 = o2.getJSONObject(0).getString("value").split("\\.");
-				int minLength = no1.length <= no2.length ? no1.length : no2.length;
-				for (int i = 0; i < minLength; i++) {
-					int n1 = Integer.parseInt(no1[i]);
-					int n2 = Integer.parseInt(no2[i]);
-					if (n1 != n2) {
-						return n1 - n2;
-					} else {
-						continue;
-					}
-				}
-				return no1.length - no2.length;
-			}
-		});
-		return JSONArray.parseArray(JSON.toJSONString(list));
-	}
 }

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessConst.java

@@ -7,7 +7,7 @@ package com.actionsoft.apps.coe.pal.batch.web.create.process;
 public class ProcessConst {
 	
 	// Excel工作表sheet页名称
-	public final static String SHEET_NAME = "流程清单";
+	public final static String SHEET_NAME_SUFFIX = "清单";
 	public final static String SHEET_HELPER = "说明";
 
 	// 扩展属性名称前后缀
@@ -17,14 +17,15 @@ public class ProcessConst {
 	// 表格表头
 	public final static String TABLE_NO = "编号";
 	public final static String TABLE_NAME = "名称";
+	public final static String TABLE_PARENT_NAME = "上级名称";
 	public final static String TABLE_TYPE = "文件类型";
 	public final static String TABLE_EXTAND_EXAMPLE = "扩展<xxx>";
 	public final static String TABLE_EXTAND_EXAMPLE2 = "...";
 	
 	// 表格表头
-	public final static String [] PROCESS_TITLE_ROW = new String [] {TABLE_NO, TABLE_NAME, TABLE_TYPE};
+	public final static String [] PROCESS_TITLE_ROW = new String [] {TABLE_NAME, TABLE_PARENT_NAME, TABLE_TYPE};
-	public final static String PROCESS_BASE_TITLE_ROW = "编号、名称、文件类型";
+	public final static String PROCESS_BASE_TITLE_ROW = "名称、上级名称、文件类型";
-	public final static String PROCESS_EXAMPLE_TITLE_ROW = "编号、名称、文件类型、扩展&lt;xxx&gt;、扩展&lt;xxx&gt;、...";
+	public final static String PROCESS_EXAMPLE_TITLE_ROW = "名称、文件类型、扩展&lt;xxx&gt;、扩展&lt;xxx&gt;、...";
 	
 	
 	

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java

@@ -1,6 +1,8 @@
 package com.actionsoft.apps.coe.pal.batch.web.create.process;
 
 import com.actionsoft.apps.AppsConst;
+import com.actionsoft.apps.coe.pal.CoeComponentsController;
+import com.actionsoft.apps.coe.pal.batch.web.create.process.model.RepositoryInfoModel;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.coe.pal.pal.method.PALMethodManager;
 import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache;
@@ -8,24 +10,36 @@ 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.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.lifecycle.api.AppsAPIManager;
 import com.actionsoft.apps.resource.AppContext;
 import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.i18n.I18nRes;
+import com.actionsoft.sdk.local.SDK;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.*;
 
 public class ProcessUtil {
 
+	/**
+	 * 获取模型清单名称
+	 * @param methodCategory
+	 * @return
+	 */
+	public static String getModelListName(String methodCategory) {
+		return I18nRes.findValue(CoEConstant.APP_ID, methodCategory) + ProcessConst.SHEET_NAME_SUFFIX;
+	}
+
 	/**
 	 * 获取流程下文件分类
 	 * @return
 	 */
+	@Deprecated
 	public static List<String> getProcessCategory() {
 		List<String> list = new ArrayList<String>();
-		list.add("简单文件分类");
+		list.add("文件夹");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -106,9 +120,10 @@ public class ProcessUtil {
 	 * 获取流程下文件分类
 	 * @return
 	 */
+	@Deprecated
 	public static Map<String, String> getProcessCategoryMethod() {
 		Map<String, String> result = new HashMap<>();
-		result.put("简单文件分类", "default");
+		result.put("文件夹", "default");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -159,14 +174,68 @@ public class ProcessUtil {
 		return result;
 	}
 
+	/**
+	 * 获取根目录下文件分类
+	 * @param category
+	 * @param reverse false：获取结果key：methodId，value：methodName      true：获取结果key：methodName，value：methodId
+	 * @return
+	 */
+	public static JSONObject getCategoryMethods(String category, boolean reverse) {
+		JSONObject result = new JSONObject();
+		if ("process".equals(category)) {
+			result.put("default", "文件夹");
+		}
+		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod(category);
+		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
+		int size = listApps.size();
+		Map<String, String> map1 = new HashMap<String, String>();
+		for (int i = 0; i < size; i++) {
+			map1.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState());
+		}
+		for (int i = 0, methodSize = methodModels.size(); i < methodSize; i++) {
+			PALMethodModel palMethodModel = methodModels.get(i);
+			String appId = palMethodModel.getId();
+			if (map1.containsKey("com.actionsoft.apps.coe.method." + appId)) {
+				String methodId1 = map1.get("com.actionsoft.apps.coe.method." + appId);
+				if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED))
+					continue;
+			}
+			// 若是制度类型，过滤掉制度图
+			if ("control".equals(category) && "control.policy".equals(palMethodModel.getId())) {
+				continue;
+			}
+			result.put(palMethodModel.getId(), I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
+		}
+		if ("process".equals(category)) {// 伊利流程类型下增加表单图和制度图
+			PALMethodModel palMethodModel = PALMethodManager.getInstance().getPALMethodModelById("control.policy");
+			if (palMethodModel != null) {
+				result.put(palMethodModel.getId(), I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
+			}
+			palMethodModel = PALMethodManager.getInstance().getPALMethodModelById("data.form");
+			if (palMethodModel != null) {
+				result.put(palMethodModel.getId(), I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
+			}
+
+		}
+		if (reverse) {// key value反转
+			JSONObject reverseResult = new JSONObject();
+			for (String key : result.keySet()) {
+				reverseResult.put(result.getString(key), key);
+			}
+			return reverseResult;
+		}
+		return result;
+	}
+
 	/**
 	 * 获取流程下文件分类
 	 *
 	 * @return
 	 */
+	@Deprecated
 	public static JSONObject getProcessMethods() {
 		JSONObject result = new JSONObject();
-		result.put("default", "简单文件分类");
+		result.put("default", "文件夹");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -188,9 +257,9 @@ public class ProcessUtil {
 		return result;
 	}
 
-	public static Set<String> getProcessMethodAttrNames(String wsId) {
+	public static Set<String> getProcessMethodAttrNames(String wsId, String methodCategory) {
 		Set<String> result = new HashSet<>();
-		List<PALMethodModel> methodIdList = PALMethodCache.getPALMethodModelListByMethod("process");
+		List<PALMethodModel> methodIdList = PALMethodCache.getPALMethodModelListByMethod(methodCategory);
 		for (PALMethodModel methodModel : methodIdList) {
 			List<PALMethodAttributeModel> attributeModelList = PALRepositoryAPIManager.getInstance().getValidAttributeModels(wsId, methodModel.getId());
 			for (PALMethodAttributeModel attributeModel : attributeModelList) {
@@ -243,10 +312,7 @@ public class ProcessUtil {
 	 * @return
 	 */
 	public static boolean isView(PALRepositoryModel model) {
-		if (model.isPublish() || model.isApproval() || model.isStop()) {
+        return model.isPublish() || model.isApproval() || model.isStop();
-			return true;
-		}
-		return false;
     }
 	
 	/**
@@ -257,10 +323,95 @@ public class ProcessUtil {
 	public static boolean isBlank(UserContext uc, PALRepositoryModel model) {
 		String define = PALRepositoryQueryAPIManager.getInstance().getProcessDefinition(uc, model.getId());
 		JSONObject array = JSONObject.parseObject(define);
-		if (array.containsKey("elements") && array.getJSONObject("elements").size() == 0) {
+        return array.containsKey("elements") && array.getJSONObject("elements").size() == 0;
-			return true;
     }
-		return false;
+
+	/**
+	 * 去除字符串所有空格，增加处理特殊空格（ASCII码值为160）
+	 * @param str
+	 * @return
+	 */
+	public static String removeAllBlack(String str) {
+		return str == null ? "" : str.replaceAll("\\u00A0+", "").replace(" ", "");
+	}
+
+	/**
+	 * 将PAL模型转换为批处理特定模型，包含名称、上级名称、ID、以及在资产库中存在的标识
+	 * @param list
+	 * @param category
+	 * @return
+	 */
+	public static List<RepositoryInfoModel> palRepository2RepositoryInfoList(List<PALRepositoryModel> list, String category) {
+		List<RepositoryInfoModel> result = new ArrayList<>();
+		for (PALRepositoryModel model : list) {
+			RepositoryInfoModel infoModel = new RepositoryInfoModel();
+			infoModel.setId(model.getId());
+			infoModel.setName(removeAllBlack(model.getName()));
+			infoModel.setPalModel(true);
+			infoModel.setMethodId(model.getMethodId());
+			infoModel.setMethodName(I18nRes.findValue(CoEConstant.APP_ID, model.getMethodId()));
+			PALRepositoryModel parentModel = getParentRepositoryModel(model.getParentId());
+			if (parentModel == null) {
+				infoModel.setParentId(category);
+				infoModel.setParentName(I18nRes.findValue(CoEConstant.APP_ID, category));
+			} else {
+				infoModel.setParentId(parentModel.getId());// 最新版本的ID
+				infoModel.setParentName(removeAllBlack(parentModel.getName()));
+			}
+			infoModel.setPathId(new ArrayList<>());
+			infoModel.setPathName(new ArrayList<>());
+			result.add(infoModel);
+		}
+		return result;
+	}
+
+	// 获取父节点
+	private static PALRepositoryModel getParentRepositoryModel(String parentId) {
+		if (parentId.length() < 36) {
+			return null;
+		} else {
+			PALRepositoryModel parentModel = PALRepositoryCache.getCache().get(parentId);
+			if (parentModel == null) {
+				List<PALRepositoryModel> verList = PALRepositoryCache.getByVersionId(parentId);
+				if (verList.size() > 0) {
+					parentModel = verList.get(0);
+				}
+			}
+			if (parentModel != null) {
+				List<PALRepositoryModel> verList = PALRepositoryCache.getByVersionId(parentModel.getVersionId());
+				verList.sort((p1, p2) -> {return (p1.getVersion() - p2.getVersion() >= 0) ? 1 : -1;});
+				return verList.get(0);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 获取指定根目录下所有的最新版本模型列表
+	 * @param wsId
+	 * @param category 根节点分类，如process，data，org等
+	 * @return
+	 */
+	public static List<PALRepositoryModel> getRecentRepositoryList(String wsId, String category) {
+		List<PALRepositoryModel> list = new ArrayList<>();
+		Set<String> ids = new HashSet<>();
+		PALRepositoryCache.getAllChildrenModelsByPid(wsId, category, list, ids);
+		// 找到最新版本，只匹配最新版本（在日志中添加此明显提示 todo）
+		List<PALRepositoryModel> recentVerList = new ArrayList<>();
+		Map<String, PALRepositoryModel> modelMap = new HashMap<>();
+		for (PALRepositoryModel model : list) {
+			if (!modelMap.containsKey(model.getVersionId())) {
+				modelMap.put(model.getVersionId(), model);
+			} else {
+				if (modelMap.get(model.getVersionId()).getVersion() < model.getVersion()) {
+					modelMap.put(model.getVersionId(), model);
+				}
+			}
+		}
+		for (Map.Entry<String, PALRepositoryModel> entry : modelMap.entrySet()) {
+			recentVerList.add(entry.getValue());
+		}
+		return recentVerList;
 	}
 	
 }

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ValidProcessExcel.java

@@ -1,13 +1,23 @@
 package com.actionsoft.apps.coe.pal.batch.web.create.process;
 
 import java.io.File;
+import java.sql.ResultSet;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import com.actionsoft.apps.coe.pal.batch.util.BatchUtil;
+import com.actionsoft.apps.coe.pal.batch.web.create.process.model.ExcelRowModel;
+import com.actionsoft.apps.coe.pal.batch.web.create.process.model.RepositoryInfoModel;
 import com.actionsoft.apps.coe.pal.batch.web.create.process.valid.impl.type.ValidAwsOrg;
 import com.actionsoft.apps.coe.pal.batch.web.create.process.valid.impl.type.ValidSelect;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
+import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
+import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.bpms.server.UserContext;
-import com.actionsoft.sdk.local.SDK;
+import com.actionsoft.bpms.util.UUIDGener;
+import com.actionsoft.i18n.I18nRes;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -40,12 +50,12 @@ public class ValidProcessExcel {
 		this.uc = uc;
 	}
 
-	public ResponseObject checkProcessList(File file, String wsId) {
+	public ResponseObject checkProcessList(File file, String wsId, String methodCategory) {
 		XSSFWorkbook wb = POIUtil.getWorkbook(file);
 		if (wb == null) {
 			return ResponseObject.newErrResponse("获取上传文件失败");
 		}
-		String sheetName = ProcessConst.SHEET_NAME;
+		String sheetName = ProcessUtil.getModelListName(methodCategory);
 		XSSFSheet sheet = wb.getSheet(sheetName);
 		if (sheet == null) {
 			return ResponseObject.newErrResponse(errMsg + "上传文件中【" + sheetName + "】工作表不存在");
@@ -58,7 +68,8 @@ public class ValidProcessExcel {
 		}
 		int cellNum = titleRow.getLastCellNum();
 		for (int i = 0; i < cellNum; i++) {
-			String title = titleRow.getCell(i).getStringCellValue();
+			XSSFCell cell = titleRow.getCell(i);
+			String title = POIUtil.getCellValueByCell(cell);
 			if (UtilString.isEmpty(title)) {
 				break;
 			}
@@ -68,7 +79,7 @@ public class ValidProcessExcel {
 			return ResponseObject.newErrResponse(errMsg + "上传文件工作表中首行为标题行，不能为空，请调整");
 		}
 		// 校验标题行
-		ResponseObject checkTitleRo = checkTitleRow(wsId, titleList);
+		ResponseObject checkTitleRo = checkTitleRow(wsId, titleList, methodCategory);
 		if (!checkTitleRo.isOk()) {
 			return checkTitleRo;
 		}
@@ -76,47 +87,197 @@ public class ValidProcessExcel {
 		// 获取所有数据
 		JSONObject result = new JSONObject();
 		result.put("titleRow", titleList);
-		result.put("data", checkData(getDataList(sheet, titleList), titleList, wsId));
+		result.put("data", checkData(getDataList(sheet, titleList), titleList, wsId, methodCategory));
 		ro.put("data", result);
 		return ro;
 	}
 
-	/**
+	private JSONObject checkData(List<List<String>> dataList, List<String> titleList, String wsId, String methodCategory) {
-	 * 校验表格数据
+		int nameIndex = titleList.indexOf(ProcessConst.TABLE_NAME);// 名称位置
-	 * @param dataList
+		int pNameIndex = titleList.indexOf(ProcessConst.TABLE_PARENT_NAME);// 上级名称位置
-	 * @param titleList
+		int typeIndex = titleList.indexOf(ProcessConst.TABLE_TYPE);// 文件类型
-	 * @param wsId
-	 */
-	private JSONArray checkData(List<List<String>> dataList, List<String> titleList, String wsId) {
-		JSONArray result = new JSONArray();
-		for (int i = 0; i < dataList.size(); i++) {
-			JSONObject noObj = null;
-			JSONObject typeObj = null;
 
-			List<String> rowDataList = dataList.get(i);
+//		System.out.println(dataList);
+//		System.out.println(titleList);
+
+		// 将excel数据记录到model
+		List<ExcelRowModel> excelRowModels = new ArrayList<>();
+		for (int i = 0; i < dataList.size(); i++) {
+			excelRowModels.add(new ExcelRowModel(i+1, dataList.get(i)));
+		}
+
+		// 1.过滤掉名称、上级名称、文件类型存在空值的数据
+		List<RepositoryInfoModel> blankList = new ArrayList<>();
+		Iterator<ExcelRowModel> iterator = excelRowModels.iterator();
+		while (iterator.hasNext()) {
+			ExcelRowModel row = iterator.next();
+			String name = ProcessUtil.removeAllBlack(row.getRowData().get(nameIndex));
+			String parentName = ProcessUtil.removeAllBlack(row.getRowData().get(pNameIndex));
+			String methodName = ProcessUtil.removeAllBlack(row.getRowData().get(typeIndex));
+			// 名称/上级名称/类型校验是否为空待定 todo
+			if (UtilString.isEmpty(name) || UtilString.isEmpty(parentName) || UtilString.isEmpty(methodName)) {
+				RepositoryInfoModel blankModel = new RepositoryInfoModel();
+				blankModel.setParentName(name);
+				blankModel.setParentName(parentName);
+				blankModel.setMethodName(methodName);
+				blankModel.setExcelModel(true);
+				blankModel.setExcelRowModel(row);
+				blankModel.setResult("blank");
+				blankModel.setRowOk(false);
+				blankModel.setRowMsg("名称、上级名称、文件类型不允许为空");
+				blankList.add(blankModel);
+				iterator.remove();
+			}
+		}
+
+		// 2.过滤Excel中的重复数据记录
+		List<RepositoryInfoModel> excelRepeatList = new ArrayList<>();
+		Map<String, Integer> tmpMap = new HashMap<>();
+		Set<String> tmpSet = new HashSet<>();
+		// 按照名称、上级名称、文件类型对重复数据进行过滤
+		iterator = excelRowModels.iterator();
+		while (iterator.hasNext()) {
+			ExcelRowModel row = iterator.next();
+			String name = ProcessUtil.removeAllBlack(row.getRowData().get(nameIndex));
+			String parentName = ProcessUtil.removeAllBlack(row.getRowData().get(pNameIndex));
+			String methodName = ProcessUtil.removeAllBlack(row.getRowData().get(typeIndex));
+			String key = name + "|" + methodName + "|" +parentName;
+			if (tmpMap.containsKey(key)) {
+				RepositoryInfoModel repeatModel = new RepositoryInfoModel();
+				repeatModel.setParentName(name);
+				repeatModel.setParentName(parentName);
+				repeatModel.setMethodName(methodName);
+				repeatModel.setExcelModel(true);
+				repeatModel.setExcelRowModel(row);
+				repeatModel.setResult("repeat");
+				repeatModel.setRowOk(false);
+				repeatModel.setRowMsg("与Excel第" + tmpMap.get(key) + "行重复");
+				excelRepeatList.add(repeatModel);
+				iterator.remove();
+			} else {
+				tmpMap.put(key, row.getRow());
+			}
+		}
+		// 3.校验在pal中是否存在并整合到目录框架
+
+		// 获取指定根目录下所有的最新版本模型列表
+		List<PALRepositoryModel> recentVerList = ProcessUtil.getRecentRepositoryList(wsId, methodCategory);
+		// 模型进行转换
+		List<RepositoryInfoModel> batchModelList = ProcessUtil.palRepository2RepositoryInfoList(recentVerList, methodCategory);
+
+		// 查找重复的
+		for (RepositoryInfoModel infoModel : batchModelList) {
+			String palName = ProcessUtil.removeAllBlack(infoModel.getName());
+			String palParentName = ProcessUtil.removeAllBlack(infoModel.getParentName());
+			String palMethodName = ProcessUtil.removeAllBlack(infoModel.getMethodName());
+			Iterator<ExcelRowModel> iterator1 = excelRowModels.iterator();
+			while (iterator1.hasNext()) {
+				ExcelRowModel row = iterator1.next();
+				String name = ProcessUtil.removeAllBlack(row.getRowData().get(nameIndex));
+				String parentName = ProcessUtil.removeAllBlack(row.getRowData().get(pNameIndex));
+				String type = ProcessUtil.removeAllBlack(row.getRowData().get(typeIndex));
+				if (name.equals(palName) && parentName.equals(palParentName) && type.equals(palMethodName)) {
+					// 是同一个
+					infoModel.setExcelModel(true);
+					infoModel.setExcelRowModel(row);
+					iterator1.remove();
+				}
+			}
+		}
+		// 剩下excelRowModels都是不重复的，同样添加到batchModelList
+		iterator = excelRowModels.iterator();
+		while (iterator.hasNext()) {
+			ExcelRowModel row = iterator.next();
+			String name = ProcessUtil.removeAllBlack(row.getRowData().get(nameIndex));
+			String parentName = ProcessUtil.removeAllBlack(row.getRowData().get(pNameIndex));
+			String methodName = ProcessUtil.removeAllBlack(row.getRowData().get(typeIndex));
+			RepositoryInfoModel newModel = new RepositoryInfoModel();
+			newModel.setId(UUIDGener.getUUID());// 构造一个id
+			newModel.setName(name);
+			newModel.setParentName(parentName);
+			if (parentName.equals(I18nRes.findValue(CoEConstant.APP_ID, methodCategory))) {// 若是根节点，构造为根节点
+				newModel.setParentId(methodCategory);
+			}
+			newModel.setMethodName(methodName);
+			newModel.setPalModel(false);
+			newModel.setExcelModel(true);
+			newModel.setPathId(new ArrayList<>());
+			newModel.setPathName(new ArrayList<>());
+			newModel.setExcelRowModel(row);
+			batchModelList.add(newModel);
+		}
+
+		// 4.计算位置(进行位置匹配)
+		// 先找根节点，依次往下构建
+		String rootName = I18nRes.findValue(CoEConstant.APP_ID, methodCategory);
+		JSONObject methodObj = ProcessUtil.getCategoryMethods(methodCategory, true);
+		List<RepositoryInfoModel> matchResult = new ArrayList<>();
+		Set<String> ids = new HashSet<>();// 记录key,防止死循环
+		List<String> pathId = new ArrayList<>();
+		pathId.add(methodCategory);
+		List<String> pathName = new ArrayList<>();
+		pathName.add(rootName);
+		// 从根节点开始构建一棵路径相连的树
+		getChildrenModels(methodCategory, rootName, pathId, pathName, batchModelList, matchResult, methodObj, ids);
+		// 匹配结果输出
+//		for (RepositoryInfoModel r : matchResult) {
+//			System.out.println(StringUtils.join(r.getPathName(), "/") + "/" + r.getName());
+//			System.out.println("palExist: " + r.isPalModel() + "  ExcelExist: " + r.isExcelModel());
+//		}
+		List<RepositoryInfoModel> noMatchList = new ArrayList<>();
+		// 找到没有匹配上的,对所有路径进行组装，没有拼接上
+		for (RepositoryInfoModel model : batchModelList) {
+			// 匹配上
+			if (model.isPalModel()) {// 资产库存在，标记为更新
+				model.setResult("update");
+			} else {// 资产库不存在，标记为新增
+				model.setResult("add");
+			}
+			if (model.isExcelModel() && !model.isPalModel() && !ids.contains(model.getId())) {
+				model.setResult("noMatch");
+				model.setRowOk(false);
+				model.setRowMsg("无法匹配到有效路径");
+				noMatchList.add(model);
+				continue;
+			}
+		}
+		// 5.进行数据校验
+		// blankList、excelRepeatList、noMatchList按整行错误对待处理，对matchResult进行校验
+		for (int i = 0; i < matchResult.size(); i++) {
+			RepositoryInfoModel model = matchResult.get(i);
+			ExcelRowModel row = model.getExcelRowModel();
+			int excelRow = row.getRow();
 			JSONArray rowJson = new JSONArray();
+			List<String> rowDataList = row.getRowData();
+			JSONObject typeObj = null;
 			for (int j = 0; j < rowDataList.size(); j++) {
 				String title = titleList.get(j);
 				String cellValue = rowDataList.get(j);
-				if (ProcessConst.TABLE_NO.equals(title)) {
+				if (ProcessConst.TABLE_NAME.equals(title)) {
-					JSONObject object = JSONObject.parseObject(new Valid(new ValidNo()).execute(cellValue).toString());
-					noObj = object;
-					rowJson.add(object);
-				} else if (ProcessConst.TABLE_NAME.equals(title)) {
 					JSONObject param = new JSONObject();
 					param.put("value", cellValue);
-					param.put("noObj", noObj);
 					param.put("wsId", wsId);
 					rowJson.add(JSONObject.parseObject(new Valid(new ValidName()).execute(param).toString()));
+				} else if (ProcessConst.TABLE_PARENT_NAME.equals(title)) {
+					JSONObject o = new JSONObject();
+					o.put("name", ProcessConst.TABLE_PARENT_NAME);
+					o.put("name2", ProcessConst.TABLE_PARENT_NAME);
+					o.put("value", BatchUtil.specialCharTransfer(cellValue));
+					o.put("isOk", true);
+					o.put("msg", "");
+					rowJson.add(o);
 				} else if (ProcessConst.TABLE_TYPE.equals(title)) {
-					JSONObject object = JSONObject.parseObject(new Valid(new ValidType()).execute(cellValue).toString());
+					JSONObject param = new JSONObject();
+					param.put("value", cellValue);
+					param.put("category", methodCategory);
+					JSONObject object = JSONObject.parseObject(new Valid(new ValidType()).execute(param).toString());
 					typeObj = object;
 					rowJson.add(object);
 				} else {// 扩展属性列
 					if (typeObj != null && typeObj.getBooleanValue("isOk")) {
 						// 获取流程类型
-						Map<String, String> categoryMethods = ProcessUtil.getProcessCategoryMethod();
+						JSONObject categoryMethods = ProcessUtil.getCategoryMethods(methodCategory, true);
-						String methodId = categoryMethods.get(typeObj.getString("value"));
+						String methodId = categoryMethods.getString(typeObj.getString("value"));
 						if ("default".equals(methodId)) {// 简单文件类型，无任何扩展属性，不校验，不显示
 							// 所有扩展属性忽略
 							break;
@@ -158,62 +319,188 @@ public class ValidProcessExcel {
 					}
 				}
 			}
-			result.add(rowJson);
+			model.setCheckResult(rowJson);
 		}
-		// 判断是否有重复编号+名称数据(前提是编号和名称校验通过）
+		// 整理最终结果
-		Map<String, Integer> map = new HashMap<>();
+		List<RepositoryInfoModel> allDataList = new ArrayList<>();
-		for (int i = 0; i < result.size(); i++) {
+		allDataList.addAll(blankList);
-			JSONArray array = result.getJSONArray(i);
+		allDataList.addAll(excelRepeatList);
-			// 编号
+		allDataList.addAll(noMatchList);
-			JSONObject noObj = array.getJSONObject(0);
+		allDataList.addAll(matchResult);
-			// 名称
+		// 整体按照Excel表中顺序排序
-			JSONObject nameObj = array.getJSONObject(1);
+		allDataList.sort((a1, a2)-> {return a1.getExcelRowModel().getRow() - a2.getExcelRowModel().getRow();});
-			
+		// 构造结果集返给前端
-			// 资产库中已存在的标识
+		int totalCount = allDataList.size();
-			if (nameObj.containsKey("isExist")) {
+		int repeatCount = excelRepeatList.size();
-				if (nameObj.getBooleanValue("isExist")) {
+		int blankCount = blankList.size();
-					noObj.put("isExist", true);
+		int noMatchCount = noMatchList.size();
-					noObj.put("plId", nameObj.getString("plId"));
+		int okCount = 0;
+		int errCount = 0;
+		for (RepositoryInfoModel model : matchResult) {
+			model.setRowOk(true);
+			JSONArray arr = model.getCheckResult();
+			for (int i = 0; i < arr.size(); i++) {
+				if (!arr.getJSONObject(i).getBooleanValue("isOk")) {
+					model.setRowOk(false);
+				}
+			}
+			if (model.isRowOk()) {
+				okCount++;
 			} else {
-					noObj.put("isExist", false);
+				errCount++;
-					noObj.put("plId", "");
-				}
-			}
-			String tmp = noObj.getString("value") + ":" + nameObj.getString("value");
-			if (!map.containsKey(tmp)) {
-				map.put(tmp, i + 1);
-			} else {
-				noObj.put("isExcelExist", true);
-				noObj.put("excelExistRow", map.get(tmp));
-			}
-		}
-		// 排序
-		// result = sort(result);
-		return result;
 			}
 
-	private JSONArray sort(JSONArray array) {
+		}
-		List<JSONArray> list = JSONObject.parseArray(array.toJSONString(), JSONArray.class);
+		// 构造返回前端结果集
-		Collections.sort(list, new Comparator<JSONArray>() {
+		JSONArray result = new JSONArray();
-
+		for (int i = 0; i < allDataList.size(); i++) {
-			@Override
+			RepositoryInfoModel model = allDataList.get(i);
-			public int compare(JSONArray o1, JSONArray o2) {
+			if ("blank".equals(model.getResult())) {// 空白，构造界面数据
-				String [] no1 = o1.getJSONObject(0).getString("value").split("\\.");
+				JSONArray row = new JSONArray();
-				String [] no2 = o2.getJSONObject(0).getString("value").split("\\.");
+				List<String> list = model.getExcelRowModel().getRowData();
-				int minLength = no1.length <= no2.length ? no1.length : no2.length;
+				for (int j = 0; j < list.size(); j++) {
-				for (int i = 0; i < minLength; i++) {
+					String s = list.get(j);
-					int n1 = Integer.parseInt(no1[i]);
+					JSONObject cell = new JSONObject();
-					int n2 = Integer.parseInt(no2[i]);
+					cell.put("name", titleList.get(j));
-					if (n1 != n2) {
+					cell.put("name2", ProcessConst.EXTEND_PROP_PREFIX + titleList.get(j) + ProcessConst.EXTEND_PROP_SUFFIX);
-						return n1 - n2;
+					if (ProcessConst.TABLE_NAME.equals(titleList.get(j))) {
+						cell.put("isOk", false);
+						cell.put("msg", model.getRowMsg());
 					} else {
+						cell.put("isOk", true);
+						cell.put("msg", "");
+					}
+					cell.put("value", s);
+					row.add(cell);
+				}
+				JSONObject rowResult = new JSONObject();
+				rowResult.put("row", row);
+				rowResult.put("excelNo", model.getExcelRowModel().getRow());// Excel中行
+				rowResult.put("pathName", "");
+				rowResult.put("isRowOk", model.isRowOk());
+				rowResult.put("result", model.getResult());
+				result.add(rowResult);
+			} else if ("repeat".equals(model.getResult())) {// 重复
+				JSONArray row = new JSONArray();
+				List<String> list = model.getExcelRowModel().getRowData();
+				for (int j = 0; j < list.size(); j++) {
+					String s = list.get(j);
+					JSONObject cell = new JSONObject();
+					cell.put("name", titleList.get(j));
+					cell.put("name2", ProcessConst.EXTEND_PROP_PREFIX + titleList.get(j) + ProcessConst.EXTEND_PROP_SUFFIX);
+					if (ProcessConst.TABLE_NAME.equals(titleList.get(j))) {
+						cell.put("isOk", false);
+						cell.put("msg", model.getRowMsg());
+					} else {
+						cell.put("isOk", true);
+						cell.put("msg", "");
+					}
+					cell.put("value", s);
+					row.add(cell);
+				}
+				JSONObject rowResult = new JSONObject();
+				rowResult.put("row", row);
+				rowResult.put("excelNo", model.getExcelRowModel().getRow());// Excel中行
+				rowResult.put("pathName", "");
+				rowResult.put("isRowOk", model.isRowOk());
+				rowResult.put("result", model.getResult());
+				result.add(rowResult);
+			} else if ("noMatch".equals(model.getResult())) {// 没匹配到
+				JSONArray row = new JSONArray();
+				List<String> list = model.getExcelRowModel().getRowData();
+				for (int j = 0; j < list.size(); j++) {
+					String s = list.get(j);
+					JSONObject cell = new JSONObject();
+					cell.put("name", titleList.get(j));
+					cell.put("name2", ProcessConst.EXTEND_PROP_PREFIX + titleList.get(j) + ProcessConst.EXTEND_PROP_SUFFIX);
+					if (ProcessConst.TABLE_NAME.equals(titleList.get(j))) {
+						cell.put("isOk", false);
+						cell.put("msg", model.getRowMsg());
+					} else {
+						cell.put("isOk", true);
+						cell.put("msg", "");
+					}
+					cell.put("value", s);
+					row.add(cell);
+				}
+				JSONObject rowResult = new JSONObject();
+				rowResult.put("row", row);
+				rowResult.put("excelNo", model.getExcelRowModel().getRow());// Excel中行
+				rowResult.put("pathName", "");
+				rowResult.put("isRowOk", model.isRowOk());
+				rowResult.put("result", model.getResult());
+				result.add(rowResult);
+			} else if ("add".equals(model.getResult())) {// 新增
+				JSONArray row = model.getCheckResult();
+				JSONObject rowResult = new JSONObject();
+				rowResult.put("row", row);
+				rowResult.put("excelNo", model.getExcelRowModel().getRow());// Excel中行
+				rowResult.put("pathName", StringUtils.join(model.getPathName(), "/"));
+				rowResult.put("isRowOk", model.isRowOk());
+				rowResult.put("result", model.getResult());
+				rowResult.put("pathIdArr", model.getPathId());
+				rowResult.put("pathNameArr", model.getPathName());
+				rowResult.put("id", model.getId());
+				rowResult.put("parentId", model.getParentId());
+				rowResult.put("methodId", model.getMethodId());
+				result.add(rowResult);
+			} else if ("update".equals(model.getResult())) {// pal中存在，更新
+				JSONArray row = model.getCheckResult();
+				JSONObject rowResult = new JSONObject();
+				rowResult.put("row", row);
+				rowResult.put("excelNo", model.getExcelRowModel().getRow());// Excel中行
+				rowResult.put("pathName", StringUtils.join(model.getPathName(), "/"));
+				rowResult.put("isRowOk", model.isRowOk());
+				rowResult.put("result", model.getResult());
+				rowResult.put("pathIdArr", model.getPathId());
+				rowResult.put("pathNameArr", model.getPathName());
+				rowResult.put("id", model.getId());
+				rowResult.put("parentId", model.getParentId());
+				rowResult.put("methodId", model.getMethodId());
+				result.add(rowResult);
+			}
+		}
+//		for (int i = 0; i < result.size(); i++) {
+//			System.out.println(result.getJSONObject(i));
+//		}
+// 		System.out.println(result);
+		JSONObject ro = new JSONObject();
+		ro.put("result", result);
+		ro.put("totalCount", totalCount);
+		ro.put("repeatCount", repeatCount);
+		ro.put("blankCount", blankCount);
+		ro.put("noMatchCount", noMatchCount);
+		ro.put("okCount", okCount);
+		ro.put("errCount", errCount);
+		return ro;
+	}
+
+	private void getChildrenModels(String parentId, String parentName, List<String> pathId, List<String> pathName, List<RepositoryInfoModel> batchModelList, List<RepositoryInfoModel> result, JSONObject methodObj, Set<String> ids) {
+		for (RepositoryInfoModel infoModel : batchModelList) {
+			if (ids.contains(infoModel.getId())) {
 				continue;
 			}
+			if (infoModel.getParentName().equals(parentName)) {
+				infoModel.setParentId(parentId);
+				for (String id : pathId) {
+					infoModel.getPathId().add(id);
+				}
+				for (String name : pathName) {
+					infoModel.getPathName().add(name);
+				}
+				infoModel.setMethodId(!methodObj.containsKey(infoModel.getMethodName()) ? "" : methodObj.getString(infoModel.getMethodName()));
+				if (infoModel.isExcelModel()) {
+					result.add(infoModel);
+				}
+				ids.add(infoModel.getId());
+				// 路径累加
+				List<String> pathId2 = new ArrayList<>(pathId);
+				pathId2.add(infoModel.getId());
+				List<String> pathName2 = new ArrayList<>(pathName);
+				pathName2.add(infoModel.getName());
+				getChildrenModels(infoModel.getId(), infoModel.getName(), pathId2, pathName2, batchModelList, result, methodObj, ids);
 			}
-				return no1.length - no2.length;
 		}
-		});
-		return JSONArray.parseArray(JSON.toJSONString(list));
 	}
 
 	private List<List<String>> getDataList(XSSFSheet sheet, List<String> titleList) {
@@ -241,8 +528,9 @@ public class ValidProcessExcel {
 	/**
 	 * 校验标题行
 	 * @param titleRow
+	 * @param methodCategory
 	 */
-	public ResponseObject checkTitleRow(String wsId, List<String> titleRow) {
+	public ResponseObject checkTitleRow(String wsId, List<String> titleRow, String methodCategory) {
 		// 标题固定行验证
 		if (titleRow.size() < ProcessConst.PROCESS_TITLE_ROW.length) {// 固定行列不够
 			StringBuilder msg = new StringBuilder();
@@ -273,7 +561,7 @@ public class ValidProcessExcel {
 		if (titleRow.size() >  ProcessConst.PROCESS_TITLE_ROW.length) {// 有扩展属性
 			List<String> illegalAttrTitle = new ArrayList<>();
 			// 获取当前扩展属性
-			Set<String> attributeNames = ProcessUtil.getProcessMethodAttrNames(wsId);
+			Set<String> attributeNames = ProcessUtil.getProcessMethodAttrNames(wsId, methodCategory);
 			for (int i = ProcessConst.PROCESS_TITLE_ROW.length; i < titleRow.size(); i++) {
 				String title = titleRow.get(i);
 				int prefix = title.indexOf("扩展<");

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/model/ExcelRowModel.java

@@ -0,0 +1,41 @@
+package com.actionsoft.apps.coe.pal.batch.web.create.process.model;
+
+import java.util.List;
+
+/**
+ * Excel行数据
+ */
+public class ExcelRowModel {
+
+    private int row;// 当前行，从1开始
+    private List<String> rowData;// 当前行数据
+
+    public ExcelRowModel(int row, List<String> rowData) {
+        this.row = row;
+        this.rowData = rowData;
+    }
+
+    public int getRow() {
+        return row;
+    }
+
+    public void setRow(int row) {
+        this.row = row;
+    }
+
+    public List<String> getRowData() {
+        return rowData;
+    }
+
+    public void setRowData(List<String> rowData) {
+        this.rowData = rowData;
+    }
+
+    @Override
+    public String toString() {
+        return "ExcelRowModel{" +
+                "row=" + row +
+                ", rowData=" + rowData +
+                '}';
+    }
+}

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/model/RepositoryInfoModel.java

@@ -0,0 +1,166 @@
+package com.actionsoft.apps.coe.pal.batch.web.create.process.model;
+
+
+import com.alibaba.fastjson.JSONArray;
+
+import java.util.List;
+
+public class RepositoryInfoModel {
+
+    private String id;
+    private String name;
+    private String parentName;// 如果parentName与根目录名称相同，则认为是在根目录下
+    private String parentId;
+    private List<String> pathId;
+    private List<String> pathName;
+    private String methodName;
+    private String methodId;
+    private boolean isPalModel;// 是否pal存在的模型
+    private boolean isExcelModel;// 是否excel中存在的模型
+    private ExcelRowModel excelRowModel;
+    private JSONArray checkResult;// 若匹配成功，存储校验结果
+    private String result;// 结果标识 blank：关键信息空白；repeat：excel信息重复；noMatch：未匹配上；update：匹配上需要更新；add：匹配上需要新增
+    private boolean isRowOk;// 行校验结果
+    private String rowMsg;// 行校验结果提示
+
+
+    public RepositoryInfoModel() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public List<String> getPathId() {
+        return pathId;
+    }
+
+    public void setPathId(List<String> pathId) {
+        this.pathId = pathId;
+    }
+
+    public List<String> getPathName() {
+        return pathName;
+    }
+
+    public void setPathName(List<String> pathName) {
+        this.pathName = pathName;
+    }
+
+    public boolean isPalModel() {
+        return isPalModel;
+    }
+
+    public void setPalModel(boolean palModel) {
+        isPalModel = palModel;
+    }
+
+    public boolean isExcelModel() {
+        return isExcelModel;
+    }
+
+    public void setExcelModel(boolean excelModel) {
+        isExcelModel = excelModel;
+    }
+
+    public String getMethodId() {
+        return methodId;
+    }
+
+    public void setMethodId(String methodId) {
+        this.methodId = methodId;
+    }
+
+    public ExcelRowModel getExcelRowModel() {
+        return excelRowModel;
+    }
+
+    public void setExcelRowModel(ExcelRowModel excelRowModel) {
+        this.excelRowModel = excelRowModel;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public JSONArray getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(JSONArray checkResult) {
+        this.checkResult = checkResult;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public boolean isRowOk() {
+        return isRowOk;
+    }
+
+    public void setRowOk(boolean rowOk) {
+        isRowOk = rowOk;
+    }
+
+    public String getRowMsg() {
+        return rowMsg;
+    }
+
+    public void setRowMsg(String rowMsg) {
+        this.rowMsg = rowMsg;
+    }
+
+    @Override
+    public String toString() {
+        return "RepositoryInfoModel{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", parentName='" + parentName + '\'' +
+                ", parentId='" + parentId + '\'' +
+                ", pathId=" + pathId +
+                ", pathName=" + pathName +
+                ", methodName='" + methodName + '\'' +
+                ", methodId='" + methodId + '\'' +
+                ", isPalModel=" + isPalModel +
+                ", isExcelModel=" + isExcelModel +
+                ", excelRowModel=" + excelRowModel +
+                '}';
+    }
+}

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/valid/impl/ValidName.java

@@ -7,9 +7,6 @@ import java.util.regex.Pattern;
 import com.actionsoft.apps.coe.pal.batch.util.BatchUtil;
 import com.actionsoft.apps.coe.pal.batch.web.create.process.ProcessConst;
 import com.actionsoft.apps.coe.pal.batch.web.create.process.valid.ValidCell;
-import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
-import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
-import com.actionsoft.bpms.util.UtilString;
 import com.alibaba.fastjson.JSONObject;
 
 /**
@@ -31,9 +28,7 @@ public class ValidName implements ValidCell {
         boolean isExist = false;
         String plId = "";
         String msg = "";
-        if (UtilString.isEmpty(value)) {
+        if (BatchUtil.containHtmlEles(value)) {
-            msg = "名称不允许为空";
-        } else if (BatchUtil.containHtmlEles(value)) {
             msg = BatchUtil.eleErrMsg;
         } else {
             isOk = true;
@@ -44,69 +39,7 @@ public class ValidName implements ValidCell {
                 Pattern p = Pattern.compile(regEx);
                 Matcher m = p.matcher(value);
 				if (m.find()) {
-//                if (false) {
-                    // 获取编号，以编号+名称判断是否存在该流程
-                    JSONObject noObj = paramObj.getJSONObject("noObj");
-                    if (noObj != null && noObj.getBooleanValue("isOk")) {// 编号校验通过
-                        String no = noObj.getString("value");
-                        String[] noArr = no.split("\\.");
-                        String pid = "process";
-                        for (int k = 1; k < noArr.length + 1; k++) {
-                            int level = k;
-                            List<PALRepositoryModel> list = PALRepositoryCache.getAllSubModelsByPid(paramObj.getString("wsId"), pid);
-                            if (list == null || list.size() == 0) {
 				    isOk = true;
-                                break;
-                            }
-                            if (k == noArr.length) {// 找到了最后一层，判断名称是否相等
-                                boolean flag = false;
-                                for (PALRepositoryModel model : list) {
-                                    if (model.isUse()) {
-                                        if (model.getLevel() == level && model.getOrderIndex() == Integer.parseInt(noArr[k - 1])) {
-                                            pid = null;
-                                            flag = true;
-                                            if (value.equals(model.getName())) {
-                                                isOk = false;
-                                                msg = ""; //""流程已存在";
-                                                plId = model.getId();
-                                                isExist = true;
-                                                pid = null;
-                                                break;
-                                            } else {
-                                                isOk = true;
-                                                isExist = false;
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                                if (flag) {
-                                    continue;
-                                } else {
-                                    isOk = true;
-                                    break;
-                                }
-                            } else {
-                                boolean flag = false;
-                                for (PALRepositoryModel model : list) {
-                                    if (model.isUse()) {
-                                        if (model.getLevel() == level && model.getOrderIndex() == Integer.parseInt(noArr[k - 1])) {
-                                            pid = model.getId();
-                                            flag = true;
-                                        }
-                                    }
-                                }
-                                if (flag) {
-                                    continue;
-                                } else {
-                                    isOk = true;
-                                    break;
-                                }
-                            }
-                        }
-                    } else {
-                        isOk = true;
-                    }
                 }
             }
 

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/valid/impl/ValidType.java

@@ -18,23 +18,25 @@ public class ValidType implements ValidCell {
 
 	@Override
 	public Object validTableCell(Object param) {
-		String type = param.toString();
+		JSONObject paramObj = JSONObject.parseObject(param.toString());
-		List<String> categorys = ProcessUtil.getProcessCategory();
+		String value = paramObj.getString("value");
+		String category = paramObj.getString("category");
+		JSONObject categoryObj = ProcessUtil.getCategoryMethods(category, true);
 		JSONObject result = new JSONObject();
 		boolean isOk = false;
 		String msg = "";
-		if (UtilString.isEmpty(type)) {
+		if (UtilString.isEmpty(value)) {
 			msg = "文件类型不允许为空";
-		} else if (BatchUtil.containHtmlEles(type)) {
+		} else if (BatchUtil.containHtmlEles(value)) {
 			msg = BatchUtil.eleErrMsg;
-		} else if (!categorys.contains(type)) {
+		} else if (!categoryObj.containsKey(value)) {
 			msg = "该文件类型不存在";
 		} else {
 			isOk = true;
 		}
 		result.put("name", ProcessConst.TABLE_TYPE);
 		result.put("name2", ProcessConst.TABLE_TYPE);
-		result.put("value", BatchUtil.specialCharTransfer(type));
+		result.put("value", BatchUtil.specialCharTransfer(value));
 		result.put("isOk", isOk);
 		result.put("msg", BatchUtil.specialCharTransfer(msg));
 		return result;

com.actionsoft.apps.coe.pal.batch/template/page/main.htm

@@ -11,4 +11,4 @@
         var shapeFileValue = '<#shapeFileValue>';
         var palId = '<#palId>';// 流程id，不为空则为设计器内单只流程形状属性替换
         var wHref = "./w";
-        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-0896b577.2aef31d9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-847f2fd2.ca5c30c5.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-d674f310.832a3f23.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-0896b577.ec2470ef.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-2d224ef1.56860032.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-3a9b7577.28a44c1e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-847f2fd2.c65bbdef.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-d674f310.e050c059.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.d580077e.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.e84aff8e.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.c8d67742.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=stylesheet><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.d580077e.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.c8d67742.js></script><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.e84aff8e.js></script></body></html>
+        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-0896b577.2aef31d9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-50c3d3b2.1b3e36e5.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-d674f310.832a3f23.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-0896b577.93b0818d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-2d224ef1.9043bb4b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-3a9b7577.a1c1d3f9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-50c3d3b2.e4e5a3c8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-d674f310.2dd90041.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.6e5c170b.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/chunk-vendors.53f73f21.css rel=stylesheet><link href=../apps/com.actionsoft.apps.coe.pal.batch/main/css/app.f3fd84ae.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/chunk-vendors.edec05de.js></script><script src=../apps/com.actionsoft.apps.coe.pal.batch/main/js/app.6e5c170b.js></script></body></html>

com.actionsoft.apps.coe.pal.batch/web/com.actionsoft.apps.coe.pal.batch/action.xml

@@ -11,6 +11,7 @@
 		<param name="type"/>
 		<param name="wsId"/>
 		<param name="versionIds"/>
+		<param name="methodCategory"/>
 	</cmd-bean>
 	<cmd-bean name="com.actionsoft.apps.coe.pal.batch_create_repository_tree_data">
 		<param name="wsId"/>
@@ -37,9 +38,11 @@
 		<param name="type"/>
 		<param name="fileValue"/>
 		<param name="fileName"/>
+		<param name="methodCategory"/>
 	</cmd-bean>
 	<cmd-bean name="com.actionsoft.apps.coe.pal.batch_create_data_save">
 		<param name="param"/>
+		<param name="methodCategory"/>
 	</cmd-bean>
 	<cmd-bean name="com.actionsoft.apps.coe.pal.batch_create_log_query">
 		<param name="type"/>

com.actionsoft.apps.coe.pal.batch/web/com.actionsoft.apps.coe.pal.batch/main/css/chunk-50c3d3b2.1b3e36e5.css

@@ -1 +1 @@
-#palRepositoryTree[data-v-9da10dd4] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-9da10dd4] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-9da10dd4] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-9da10dd4] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-9da10dd4]{overflow:auto;width:458px;height:200px}#palRepositoryTree[data-v-9da10dd4] .el-tree{min-width:100%;display:inline-block!important}#mycode[data-v-23d00217] .CodeMirror-lines{background-color:#2c2c2c;color:#58a0f0}#mycode[data-v-23d00217] .CodeMirror{height:auto!important}#header[data-v-fa72a222] .el-step__title{font-size:14px}
+#palRepositoryTree[data-v-9da10dd4] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-9da10dd4] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-9da10dd4] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-9da10dd4] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-9da10dd4]{overflow:auto;width:458px;height:200px}#palRepositoryTree[data-v-9da10dd4] .el-tree{min-width:100%;display:inline-block!important}#mycode[data-v-64ad3307] .CodeMirror-lines{background-color:#2c2c2c;color:#58a0f0}#mycode[data-v-64ad3307] .CodeMirror{height:auto!important}#header[data-v-538e7c68] .el-step__title{font-size:14px}

com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java

@@ -197,16 +197,27 @@ public class CooperationWeb extends ActionWeb {
         if (adminArr.size() == 0) {
             adminArr.add(_uc.getUID());
         }
+        //新旧权限版本
+        boolean isOlderVersion = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true);
+        if (isOlderVersion){
             // 校验管理员是否全部都在pal用户中
             String illegalUsers = checkCoeUserValid(adminArr);
             if (illegalUsers.length() > 0) {
                 return ResponseObject.newErrResponse("以下用户非PAL用户，请重新选择PAL用户进行保存[" + illegalUsers + "]").toString();
             }
+        }else{
+            for (int i = 0; i < adminArr.size(); i++) {
+                String adminId = adminArr.getString(i);
+                UserModel model = UserCache.getModel(adminId);
+                if (null == model){
+                    return ResponseObject.newErrResponse("管理员id参数异常").toString();
+                }
+            }
+        }
+
         // 小组权限信息
         JSONArray repositoryVerIds = dataObj.getJSONArray("repositorys");
         CoeCooperationAPIManager api = CoeCooperationAPIManager.getInstance();
-        //新权限标志
-        boolean isOlderVersion = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true);
         if (UtilString.isEmpty(teamId)) {// 新建
             Timestamp nowTime = new Timestamp(System.currentTimeMillis());
             teamId = UUIDGener.getUUID();
@@ -243,10 +254,37 @@ public class CooperationWeb extends ActionWeb {
                     CoeCooperationRoleModel role = api.queryCooperationRoleByType(teamId, CoeCooperationConst.ROLE_TYPE_MANAGER).get(0);
                     // 创建管理员信息
                     List<CoeCooperationMemberModel> members = new ArrayList<>();
+                    List<String> awsUsers = new ArrayList<>();
                     for (int i = 0; i < adminArr.size(); i++) {
-                        CoeCooperationMemberModel member = new CoeCooperationMemberModel(UUIDGener.getUUID(), teamId, adminArr.getString(i), role.getId(), _uc.getUID(),nowTime, _uc.getUID(), nowTime);
+                        String adminId = adminArr.getString(i);
+                        CoeCooperationMemberModel member = new CoeCooperationMemberModel(UUIDGener.getUUID(), teamId, adminId, role.getId(), _uc.getUID(),nowTime, _uc.getUID(), nowTime);
                         members.add(member);
+                        //新权限
+                        if (!isOlderVersion){
+                            boolean coeUserFlag = new CoeUser().validateIsAccessCOE(adminId);
+                            if (!coeUserFlag && null != UserCache.getModel(adminId)){
+                                awsUsers.add(adminId);
                             }
+                        }
+                    }
+
+                    //有额外的aws平台用户
+                    if (!awsUsers.isEmpty()){
+                        CoeUser coeUserDao = new CoeUser();
+                        //pal最大用户量许可
+                        int maxUser = Quota.getMaxCoEPALUser();
+                        List<CoeUserModel> coeUsers = coeUserDao.getCoeUsers();
+                        if (maxUser < coeUsers.size() + awsUsers.size()){
+                           //超出最大用户量
+                            return ResponseObject.newWarnResponse("用户数已超过许可总数(许可最大用户数" + maxUser + ")").toString();
+                        }
+                        coeUserDao.batchInsert(awsUsers,false);
+                        // 操作行为日志记录
+                        if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
+                            CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_COOPERATION, CoEOpLogConst.OP_UPDATE, CoEOpLogConst.INFO_USER_CREATE);
+                        }
+                    }
+
                     isOk = api.createCooperationMemebers(members);
                     msg = "保存小组管理员信息";
                     if (isOk && repositoryVerIds.size() > 0) {
@@ -290,13 +328,39 @@ public class CooperationWeb extends ActionWeb {
                 CoeCooperationRoleModel role = api.queryCooperationRoleByType(teamId, CoeCooperationConst.ROLE_TYPE_MANAGER).get(0);
                 // 创建管理员信息
                 List<CoeCooperationMemberModel> members = new ArrayList<>();
+                List<String> awsUsers = new ArrayList<>();
                 for (int i = 0; i < adminArr.size(); i++) {
                     String userId = adminArr.getString(i);
                     // 删除该用户（若存在)
                     api.removeCooperationMemeber(teamId, userId);
                     CoeCooperationMemberModel member = new CoeCooperationMemberModel(UUIDGener.getUUID(), teamId, userId, role.getId(), _uc.getUID(),null, _uc.getUID(), null);
                     members.add(member);
+                    //新权限
+                    if (!isOlderVersion){
+                        boolean coeUserFlag = new CoeUser().validateIsAccessCOE(userId);
+                        if (!coeUserFlag && null != UserCache.getModel(userId)){
+                            awsUsers.add(userId);
                         }
+                    }
+                }
+
+                //有额外的aws平台用户
+                if (!awsUsers.isEmpty()){
+                    CoeUser coeUserDao = new CoeUser();
+                    //pal最大用户量许可
+                    int maxUser = Quota.getMaxCoEPALUser();
+                    List<CoeUserModel> coeUsers = coeUserDao.getCoeUsers();
+                    if (maxUser < coeUsers.size() + awsUsers.size()){
+                        //超出最大用户量
+                        return ResponseObject.newWarnResponse("用户数已超过许可总数(许可最大用户数" + maxUser + ")").toString();
+                    }
+                    coeUserDao.batchInsert(awsUsers,false);
+                    // 操作行为日志记录
+                    if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) {
+                        CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_COOPERATION, CoEOpLogConst.OP_UPDATE, CoEOpLogConst.INFO_USER_CREATE);
+                    }
+                }
+
                 isOk = api.createCooperationMemebers(members);
                 if (isOk && !isOlderVersion){
                     //重新创建默认用户权限
@@ -925,7 +989,7 @@ public class CooperationWeb extends ActionWeb {
                     //新版权限具体文件的操作权限
                     List<CoeCooperationRolePermModel> rolePermModels = api.queryCooperationRoleDataPermList(teamId, roleId);
                     for (CoeCooperationRolePermModel rolePermModel : rolePermModels) {
-                        if (rolePermModel.getActionPerm() == null){
+                        if (rolePermModel.getActionPerm() == null || StringUtils.isEmpty(rolePermModel.getActionPerm())){
                            dataActionPerm.put(rolePermModel.getPalVersionId(),new ArrayList<>());
                            continue;
                         }
@@ -1057,7 +1121,7 @@ public class CooperationWeb extends ActionWeb {
             //具体文件的操作权限
             List<CoeCooperationRolePermModel> rolePermModels = api.queryCooperationRoleDataPermList(teamId, role.getId());
             for (CoeCooperationRolePermModel rolePermModel : rolePermModels) {
-                if (rolePermModel.getActionPerm() == null){
+                if (rolePermModel.getActionPerm() == null || StringUtils.isEmpty(rolePermModel.getActionPerm())){
                     dataActionPerm.put(rolePermModel.getPalVersionId(),new ArrayList<>());
                     continue;
                 }
@@ -1095,6 +1159,7 @@ public class CooperationWeb extends ActionWeb {
         ro.put("dataActionPermOpts", dataActionPermOpts);
         ro.put("appPerm", appPerm);
         ro.put("actionPerm", actionPerm);
+        ro.put("teamPermFileSize", CooperationCache.getTeamInfo(teamId).getVersionIds().size());
         ro.put("dataPermText", StringUtils.join(dataPermTextList, ","));
 
         return ro.toString();
@@ -1216,16 +1281,28 @@ public class CooperationWeb extends ActionWeb {
      * @return
      */
     public String searchCooperationTeamRepositoryAllChildrenData(String wsId, String teamId, String pid) {
+        JSONArray result = new JSONArray();
         Set<String> versionIds = CooperationUtil.getPermRepositoryVersionIds(wsId, teamId, null, null);
+        if (StringUtils.isNotEmpty(pid)){
             List<PALRepositoryModel> list = new ArrayList<>();
             Set<String> idSet = new HashSet<>();
             PALRepositoryCache.getAllChildrenModelsByPid(wsId, pid, list, idSet);
-        JSONArray result = new JSONArray();
             for (PALRepositoryModel model : list) {
                 if (versionIds.contains(model.getVersionId()) && model.isUse()) {
                     result.add(model.getVersionId());
                 }
             }
+        }else {
+            for (String versionId : versionIds) {
+                List<PALRepositoryModel> repositoryModels = PALRepositoryCache.getByVersionId(wsId, versionId);
+                for (PALRepositoryModel repositoryModel : repositoryModels) {
+                    if (repositoryModel.isUse()){
+                        result.add(versionId);
+                        break;
+                    }
+                }
+            }
+        }
         ResponseObject ro = ResponseObject.newOkResponse();
         ro.setData(result);
         return ro.toString();
@@ -1727,8 +1804,10 @@ public class CooperationWeb extends ActionWeb {
 
         //处理隐藏角色的权限复制，
         CoeCooperationRoleModel originHideRole = api.queryCooperationTeamHideRole(teamId, userid);
-        api.removeCooperationRolePerms(teamId,originHideRole.getId());
+        if (null != originHideRole){
             CoeCooperationRoleModel targetHideRole = api.queryCooperationTeamHideRole(teamId, targetUserid);
+            if (null != targetHideRole){
+                api.removeCooperationRolePerms(teamId,originHideRole.getId());
                 List<CoeCooperationRolePermModel> targetRolePerms = api.queryCooperationRoleDataPermList(teamId, targetHideRole.getId());
                 List<CoeCooperationRolePermModel> permModelList = new ArrayList<>();
                 for (CoeCooperationRolePermModel targetRolePerm : targetRolePerms) {
@@ -1736,6 +1815,8 @@ public class CooperationWeb extends ActionWeb {
                     permModelList.add(permModel);
                 }
                 api.createCooperationRolePerms(permModelList);
+            }
+        }
 
         return ro.toString();
     }

com.actionsoft.apps.coe.pal.cooperation/template/page/main.htm

@@ -1,4 +1,4 @@
 <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/favicon.ico><title>com.actionsoft.apps.coe.pal.cooperation</title><script src=../commons/awsui/js/icon.array.js></script><script>const settingParam = <#settingParam>;
       const axiosBaseUrl = "./";
       const production = true;</script><script>var mainPage = "<#mainPage>";
-        var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-0dd2cad3.a8b373f0.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-2066fd0b.b9ca5ce6.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-317b5b43.71aff415.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-0dd2cad3.7e061ba3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2066fd0b.5a0e8ae8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.6edc6518.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-317b5b43.3d8f6440.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.6f6eb298.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.6f6eb298.js></script></body></html>
+        var isManage = <#isManage>;</script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-36a984ec.af1b75cb.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3fc8dcbc.8047f46f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-d74632f4.1488969e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-2d224ef1.6edc6518.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-36a984ec.5e9597ac.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-3fc8dcbc.e2e08289.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-d74632f4.63b738a2.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.d0cf21b9.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal.cooperation/main/css/app.57e8682f.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/chunk-vendors.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal.cooperation/main/js/app.d0cf21b9.js></script></body></html>

com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-2066fd0b.b9ca5ce6.css

@@ -1 +0,0 @@
-#update[data-v-55cdd3f4] .el-step__title{font-size:12px}#update[data-v-55cdd3f4] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-55cdd3f4]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-55cdd3f4]{color:#fff;font-size:52px}

com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-36a984ec.af1b75cb.css

@@ -1 +1 @@
-#update[data-v-55cdd3f4] .el-step__title{font-size:12px}#update[data-v-55cdd3f4] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-55cdd3f4]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-55cdd3f4]{color:#fff;font-size:52px}#update[data-v-79ec4cf2] .el-main{display:block;flex:1;flex-basis:auto;overflow:auto;padding-top:20px;padding-left:20px;padding-right:0;padding-bottom:0}#update[data-v-79ec4cf2] .el-table__row .operate-icon-display{display:none}#update[data-v-79ec4cf2] .el-table__row:hover .operate-icon-display{display:inline-block}#update[data-v-79ec4cf2] .table-row-icon-cloumn .cell{padding-right:0!important}.icon-div-repository[data-v-79ec4cf2]{border-radius:15%;display:inline-block;width:32px;height:32px;text-align:center;line-height:32px;vertical-align:middle}.icon-dynamic-repository[data-v-79ec4cf2]{color:#fff;font-size:18px}
+#update[data-v-66b295aa] .el-step__title{font-size:12px}#update[data-v-66b295aa] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-66b295aa]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-66b295aa]{color:#fff;font-size:52px}#update[data-v-79ec4cf2] .el-main{display:block;flex:1;flex-basis:auto;overflow:auto;padding-top:20px;padding-left:20px;padding-right:0;padding-bottom:0}#update[data-v-79ec4cf2] .el-table__row .operate-icon-display{display:none}#update[data-v-79ec4cf2] .el-table__row:hover .operate-icon-display{display:inline-block}#update[data-v-79ec4cf2] .table-row-icon-cloumn .cell{padding-right:0!important}.icon-div-repository[data-v-79ec4cf2]{border-radius:15%;display:inline-block;width:32px;height:32px;text-align:center;line-height:32px;vertical-align:middle}.icon-dynamic-repository[data-v-79ec4cf2]{color:#fff;font-size:18px}

com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-3fc8dcbc.8047f46f.css

@@ -0,0 +1 @@
+#update[data-v-66b295aa] .el-step__title{font-size:12px}#update[data-v-66b295aa] .awsui-icon-picker-box1{border-radius:15%}.icon-team-div[data-v-66b295aa]{height:70px;width:70px;line-height:70px;display:inline-block;position:absolute;z-index:2;right:30px;top:50px}.icon-team[data-v-66b295aa]{color:#fff;font-size:52px}

com.actionsoft.apps.coe.pal.cooperation/web/com.actionsoft.apps.coe.pal.cooperation/main/css/chunk-d74632f4.1488969e.css

@@ -1 +1 @@
-#manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-b98e4e7e] .awsui-main{padding:0 20px!important}#tableMain[data-v-b98e4e7e] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-b98e4e7e] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-b98e4e7e] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-b98e4e7e] .el-table__row:hover .operate-icon-display,.inline-block[data-v-b98e4e7e]{display:inline-block}.team-icon-div[data-v-b98e4e7e]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-b98e4e7e]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0}
+#manageMain[data-v-ac2e0a1e] .awsui-dialog__body{padding-top:5px}#manageMain[data-v-ac2e0a1e] .awsui-icon-picker-box1{border-radius:15%}.team-item-div[data-v-ac2e0a1e]{height:46px;padding:6px 0 4px 0}.team-item-icon-div[data-v-ac2e0a1e]{position:relative;top:5px;width:32px;height:32px;line-height:32px;vertical-align:middle;text-align:center;border-radius:15%}.team-item-text-div[data-v-ac2e0a1e]{margin-left:7px;position:relative;top:12px}.team-item-text-div div[data-v-ac2e0a1e]{width:170px}.team-item-text-div div p[data-v-ac2e0a1e]{width:160px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.inline-block[data-v-ac2e0a1e]{display:inline-block}.cursor-pointer[data-v-ac2e0a1e]{cursor:pointer}.general-bgcolor-hover:hover .icon-drag[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .icon-drag[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .operate-icon-display[data-v-ac2e0a1e]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-ac2e0a1e]{display:none}.general-bgcolor-hover:hover .team-item-text-div p[data-v-ac2e0a1e]{color:#4e7ff9!important}.team-item-div-checked[data-v-ac2e0a1e]{color:#4e7ff9}.icon-team-div[data-v-ac2e0a1e]{position:absolute;right:40px;top:45px;z-index:2;height:70px;width:70px;line-height:70px;display:inline-block}.icon-team[data-v-ac2e0a1e]{color:#fff;font-size:52px}.required-logo[data-v-ac2e0a1e] label{margin-left:10px}#palRepositoryTree[data-v-dbb2ca8e] .el-dialog__body{padding:10px 20px;color:#606266;font-size:14px;word-break:break-all}#palRepositoryTree[data-v-dbb2ca8e] .el-input__inner{border-radius:0}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{background-color:#f5f7fa;color:#4e7ff9}#palRepositoryTree[data-v-dbb2ca8e] .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .awsui-iconfont{color:#4e7ff9!important}.tree[data-v-dbb2ca8e]{overflow:auto;width:432px;height:300px}#palRepositoryTree[data-v-dbb2ca8e] .el-tree{min-width:100%;display:inline-block!important}.allGroup[data-v-e049102a]{display:flex}.allGroup .processAll[data-v-e049102a]{margin-left:5px}.allGroup .actionGroup[data-v-e049102a]{flex:1;text-align:right;padding-right:1px}#roleManage[data-v-5b5b40a9] .awsui-dialog__body{margin:0 16px}#roleManage[data-v-5b5b40a9] .role_data_perm_textarea textarea{cursor:pointer}.text-overflow-hidden[data-v-5b5b40a9]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.general-bgcolor-hover:hover .operate-icon-display[data-v-5b5b40a9]{display:inline}.general-bgcolor-hover .operate-icon-display[data-v-5b5b40a9]{display:none}#manageList[data-v-1de625d3] .awsui-main{padding:0 20px!important}#tableMain[data-v-1de625d3] .hideCheckBoxCell .el-checkbox__input{visibility:hidden}#tableMain[data-v-1de625d3] .el-table__header-wrapper .el-checkbox,#tableMain[data-v-1de625d3] .el-table__row .operate-icon-display{display:none}#tableMain[data-v-1de625d3] .el-table__row:hover .operate-icon-display,.inline-block[data-v-1de625d3]{display:inline-block}.team-icon-div[data-v-1de625d3]{text-align:center;border-radius:15%}.text-overflow-hidden[data-v-1de625d3]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#manage[data-v-eb099fd6] .awsui-aside,#manage[data-v-eb099fd6] .awsui-main{padding:0}

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java

@@ -51,18 +51,18 @@ import java.util.stream.Collectors;
 
 public class ArisXmlImportRun {
 
-    private UserContext uc;
+    private final UserContext uc;
-    private String wsId;
+    private final String wsId;
-    private String logId;
+    private final String logId;
-    private String logPath;
+    private final String logPath;
-    private File simpleLogFile;
+    private final File simpleLogFile;
-    private File fullLogFile;
+    private final File fullLogFile;
-    private File warnLogFile;
+    private final File warnLogFile;
-    private File successLogFile;// 客户特殊需要，记录成功日志
+    private final File successLogFile;// 客户特殊需要，记录成功日志
-    private File matchErrImportFile;// 匹配失败记录
+    private final File matchErrImportFile;// 匹配失败记录
-    private String filePath;
+    private final String filePath;
-    private String fileName;
+    private final String fileName;
-    private long startTime;
+    private final long startTime;
 
     private long endTime;
 
@@ -142,12 +142,12 @@ public class ArisXmlImportRun {
             // 获取所有PAL EPC的模型
             Map<String, String> palArisPropValMap = ProcessUtil.getPalRepositoryArisPathMap(wsId);
 
-            LogUtil.appendLog("\n" + Constant.LOG_START + "开始查询PAL流程清单的所有ARIS地址属性内容", fullLogFile);
+            LogUtil.appendLog("\n" + Constant.LOG_START + "开始查询PAL流程清单的所有ARIS地址+名称属性内容", fullLogFile);
             for (Map.Entry<String, String> entry : palArisPropValMap.entrySet()) {
-                LogUtil.appendLog("名称：---" + PALRepositoryCache.getCache().get(entry.getKey()).getName() + "---，ARIS地址：----" + entry.getValue() + "----", fullLogFile);
+                LogUtil.appendLog("名称：---" + PALRepositoryCache.getCache().get(entry.getKey()).getName() + "---，ARIS地址+名称：----" + entry.getValue() + "----", fullLogFile);
             }
 
-            LogUtil.appendLog("\n" + Constant.LOG_END + "开始查询PAL流程清单的所有ARIS地址属性内容", fullLogFile);
+            LogUtil.appendLog("\n" + Constant.LOG_END + "开始查询PAL流程清单的所有ARIS地址+名称属性内容", fullLogFile);
 
 
 
@@ -161,7 +161,7 @@ public class ArisXmlImportRun {
             int totalCount = LogRealTimeCountCache.getCache().get(logId).getTotalCount();
             for (int i = 0; i < arisEpcModelList.size(); i++) {
                 ModelModel arisModel = arisEpcModelList.get(i);
-                String arisPath = ArisConstant.ARIS_ROOT_PATH + arisModel.getModelPath();
+                String arisPath = ArisConstant.ARIS_ROOT_PATH + arisModel.getModelPath() + "\\" + arisModel.getName();
                 int importingCount = i + 1;// 当前是导入的第几个
                 LogRealTimeCountCache.getCache().get(logId).setImportingCount(importingCount);// 当前记录缓存
                 // 当前正在导入的流程全部日志记录，方便对照
@@ -176,7 +176,7 @@ public class ArisXmlImportRun {
                     // 空模型当作警告处理，全部记录
                     LogUtil.appendLog(Constant.LOG_WARNING + "ARIS流程" + "[" + arisModel.getName() + "]内容为空，忽略导入", simpleLogFile, fullLogFile, warnLogFile);
                     LogUtil.appendLog(Constant.LOG_DESC + "该流程所属路径：" + arisPath);
-                    LogUtil.appendLog("[ARIS流程为空]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址[" + arisPath + "]", matchErrImportFile);
+                    LogUtil.appendLog("[ARIS流程为空]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址+名称[" + arisPath + "]", matchErrImportFile);
                     LogRealTimeCountCache.getCache().get(logId).setArisBlankCount(LogRealTimeCountCache.getCache().get(logId).getArisBlankCount() + 1);
                     continue;
                 }
@@ -200,7 +200,7 @@ public class ArisXmlImportRun {
                 if (!flag) {
                     LogUtil.appendLog(Constant.LOG_WARNING + "ARIS流程" + "[" + arisModel.getName() + "]未匹配到PAL过程链图", simpleLogFile, fullLogFile, warnLogFile);
                     LogUtil.appendLog(Constant.LOG_DESC + "ARIS流程所属路径：" + arisPath, simpleLogFile, fullLogFile, warnLogFile);
-                    LogUtil.appendLog("[未匹配到]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址[" + arisPath + "]", matchErrImportFile);
+                    LogUtil.appendLog("[未匹配到]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址+名称[" + arisPath + "]", matchErrImportFile);
                     LogRealTimeCountCache.getCache().get(logId).setMatchFieldCount(LogRealTimeCountCache.getCache().get(logId).getMatchFieldCount() + 1);
                     continue;
                 }
@@ -221,7 +221,7 @@ public class ArisXmlImportRun {
                     LogUtil.appendLog(Constant.LOG_WARNING + "匹配到的PAL过程链图模型已存在数据，不允许导入，忽略", simpleLogFile, fullLogFile, warnLogFile);
                     LogUtil.appendLog(Constant.LOG_DESC + "ARIS流程所属路径：" + arisPath, simpleLogFile, fullLogFile);
                     LogUtil.appendLog(Constant.LOG_DESC + "PAL过程链图所属路径：" + ProcessUtil.getRepositoryPath(palModel.getId()), simpleLogFile, fullLogFile);
-                    LogUtil.appendLog("[PAL已存在内容]PAL流程["+ palModel.getName() + "]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址[" + arisPath + "]", matchErrImportFile);
+                    LogUtil.appendLog("[PAL已存在内容]PAL流程["+ palModel.getName() + "]ARIS流程" + "[" + arisModel.getName() + "]，ARIS地址+名称[" + arisPath + "]", matchErrImportFile);
                     LogRealTimeCountCache.getCache().get(logId).setPalExistsCount(LogRealTimeCountCache.getCache().get(logId).getPalExistsCount() + 1);
                     continue;
                 }
@@ -330,7 +330,7 @@ public class ArisXmlImportRun {
 
                 LogUtil.appendLog("\n" + Constant.LOG_END + "导入ARIS流程" + "[" + arisModel.getName() + "]", simpleLogFile, fullLogFile, warnLogFile);
 
-                LogUtil.appendLog(Constant.LOG_END + "导入成功的PAL流程" + "[" + palModel.getName() + "]，ARIS地址[ " + palArisPropValMap.get(palModel.getId()) + " ]", successLogFile);
+                LogUtil.appendLog(Constant.LOG_END + "导入成功的PAL流程" + "[" + palModel.getName() + "]，ARIS地址+名称[ " + palArisPropValMap.get(palModel.getId()) + " ]", successLogFile);
             }
             endTime = System.currentTimeMillis();
             Timestamp endDate = new Timestamp(endTime);
@@ -569,7 +569,7 @@ public class ArisXmlImportRun {
                     attrNumberObj.put("scope", attributeModel.getScope());
                     attrNumberObj.put("name", attributeModel.getTitle());
                     attrNumberObj.put("id", attributeModel.getKey());
-                    attrNumberObj.put("textarea", attributeModel.getType());
+                    attrNumberObj.put("type", attributeModel.getType());
                     attrNumberObj.put("groupPath", attributeModel.getGroupPath());
                     attrNumberObj.put("desc", attributeModel.getDesc());
 
@@ -600,7 +600,7 @@ public class ArisXmlImportRun {
                     attrDescObj.put("scope", attributeModel.getScope());
                     attrDescObj.put("name", attributeModel.getTitle());
                     attrDescObj.put("id", attributeModel.getKey());
-                    attrDescObj.put("textarea", attributeModel.getType());
+                    attrDescObj.put("type", attributeModel.getType());
                     attrDescObj.put("groupPath", attributeModel.getGroupPath());
                     attrDescObj.put("desc", attributeModel.getDesc());
 

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportWeb.java

@@ -57,7 +57,7 @@ public class ArisXmlImportWeb extends ActionWeb {
     private File warnLogFile;
     private String filePath;
     private String fileName;
-    private long startTime = System.currentTimeMillis();
+    private final long startTime = System.currentTimeMillis();
 
     // Timestamp startDate = new Timestamp(System.currentTimeMillis());
 
@@ -249,28 +249,28 @@ public class ArisXmlImportWeb extends ActionWeb {
             arisEpcPathMap.get(model.getModelPath()).add(model.getId());
         }
 
-        LogUtil.appendLog("\n" + Constant.LOG_START + "************[执行阶段][校验ARIS EPC流程路径唯一性]Aris xml EPC流程所属目录唯一性************", simpleLogFile, fullLogFile);
+//        LogUtil.appendLog("\n" + Constant.LOG_START + "************[执行阶段][校验ARIS EPC流程路径唯一性]Aris xml EPC流程所属目录唯一性************", simpleLogFile, fullLogFile);
-
+//
         boolean flag = false;
-        for (Map.Entry<String, Set<String>> entry : arisEpcPathMap.entrySet()) {
+//        for (Map.Entry<String, Set<String>> entry : arisEpcPathMap.entrySet()) {
-            if (entry.getValue().size() > 1) {
+//            if (entry.getValue().size() > 1) {
-                Set<String> modelIds = entry.getValue();
+//                Set<String> modelIds = entry.getValue();
-                for (String arisModelId : modelIds) {
+//                for (String arisModelId : modelIds) {
-                    ModelModel model = handleWeb.modelMap.get(arisModelId);
+//                    ModelModel model = handleWeb.modelMap.get(arisModelId);
-                    String name = model.getName();
+//                    String name = model.getName();
-                    String path = ArisConstant.ARIS_ROOT_PATH + model.getModelPath();
+//                    String path = ArisConstant.ARIS_ROOT_PATH + model.getModelPath();
-                    LogUtil.appendLog(Constant.LOG_ERROR + "ARIS XML中流程[" + name + "]所属目录重复，所属目录[" + path + "]", simpleLogFile, fullLogFile, warnLogFile);
+//                    LogUtil.appendLog(Constant.LOG_ERROR + "ARIS XML中流程[" + name + "]所属目录重复，所属目录[" + path + "]", simpleLogFile, fullLogFile, warnLogFile);
-                }
+//                }
-                flag = true;
+//                flag = true;
-            }
+//            }
-        }
+//        }
-        if (flag) {
+//        if (flag) {
-            msg = "Aris xml文件中存在多个流程同属于一个架构路径，详情查看日志";
+//            msg = "Aris xml文件中存在多个流程同属于一个架构路径，详情查看日志";
-            updateErrLog(msg, msg);
+//            updateErrLog(msg, msg);
-            ro.err(msg);
+//            ro.err(msg);
-            return ro.toString();
+//            return ro.toString();
-        }
+//        }
-        LogUtil.appendLog(Constant.LOG_END + "[执行阶段][校验Aris EPC流程路径唯一性]", simpleLogFile, fullLogFile);
+//        LogUtil.appendLog(Constant.LOG_END + "[执行阶段][校验Aris EPC流程路径唯一性]", simpleLogFile, fullLogFile);
 
         // 校验pal aris地址属性路径是否存在重复问题
         // 获取所有PAL EPC的模型
@@ -284,7 +284,7 @@ public class ArisXmlImportWeb extends ActionWeb {
             palEpcArisPathMap.get(entry.getValue()).add(entry.getKey());
         }
 
-        LogUtil.appendLog("\n" + Constant.LOG_START + "************[执行阶段][校验PAL EPC文件属性ARIS地址唯一性]PAL EPC流程文件属性ARIS地址唯一性************", simpleLogFile, fullLogFile);
+        LogUtil.appendLog("\n" + Constant.LOG_START + "************[执行阶段][校验PAL EPC文件属性ARIS地址+名称唯一性]PAL EPC流程文件属性ARIS地址+名称唯一性************", simpleLogFile, fullLogFile);
 
         flag = false;
         for (Map.Entry<String, Set<String>> entry : palEpcArisPathMap.entrySet()) {
@@ -294,18 +294,18 @@ public class ArisXmlImportWeb extends ActionWeb {
                     PALRepositoryModel plModel = PALRepositoryCache.getCache().get(id);
                     String name = plModel.getName();
                     String path = ProcessUtil.getRepositoryPath(id);
-                    LogUtil.appendLog(Constant.LOG_ERROR + "PAL中流程[" + name + "][V" + plModel.getVersion() + "]文件属性ARIS地址属性内容重复，属性内容[" + path + "]", simpleLogFile, fullLogFile, warnLogFile);
+                    LogUtil.appendLog(Constant.LOG_ERROR + "PAL中流程[" + name + "][V" + plModel.getVersion() + "]文件属性ARIS地址+名称属性内容重复，属性内容[" + path + "]", simpleLogFile, fullLogFile, warnLogFile);
                 }
                 flag = true;
             }
         }
         if (flag) {
-            msg = "PAL 文件属性ARIS地址内容存在重复，详情查看日志";
+            msg = "PAL 文件属性ARIS地址+名称内容存在重复，详情查看日志";
             updateErrLog(msg, msg);
             ro.err(msg);
             return ro.toString();
         }
-        LogUtil.appendLog(Constant.LOG_END + "[执行阶段][校验PAL EPC文件属性ARIS地址唯一性]", simpleLogFile, fullLogFile);
+        LogUtil.appendLog(Constant.LOG_END + "[执行阶段][校验PAL EPC文件属性ARIS地址+名称唯一性]", simpleLogFile, fullLogFile);
 
 
         // 存储缓存，导入计数
@@ -374,7 +374,7 @@ public class ArisXmlImportWeb extends ActionWeb {
     private ResponseObject checkMethodConfig(String wsId) {
         // 校验EPC图的文件属性
         // 校验前置流程、后置流程
-        ResponseObject checkRo = checkMethodAttrExist(wsId, Constant.PROCESS_EPC, null, Constant.METHOD_PRE_PROCESS, Constant.METHOD_NEXT_PROCESS, Constant.METHOD_ARIS_URL);
+        ResponseObject checkRo = checkMethodAttrExist(wsId, Constant.PROCESS_EPC, null, Constant.METHOD_PRE_PROCESS, Constant.METHOD_NEXT_PROCESS, Constant.METHOD_ARIS_URL, Constant.METHOD_ARIS_NAME);
         if (checkRo.isErr()) {
             return checkRo;
         }

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/constant/Constant.java

@@ -56,6 +56,8 @@ public class Constant {
 //    public static final String METHOD_ARIS_URL = "ARISURL";
     public static final String METHOD_ARIS_URL = "ARIS";
 
+    public static final String METHOD_ARIS_NAME = "ARIS_process_name";
+
     // 建模属性代码--IT系统别名
     public static final String METHOD_OTHER_NAME = "otherName";
 

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/ProcessUtil.java

@@ -17,6 +17,7 @@ import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
 import com.actionsoft.apps.lifecycle.api.AppsAPIManager;
 import com.actionsoft.apps.resource.AppContext;
 import com.actionsoft.bpms.server.UserContext;
+import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.i18n.I18nRes;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -35,7 +36,7 @@ public class ProcessUtil {
 	 */
 	public static List<String> getProcessCategory() {
 		List<String> list = new ArrayList<String>();
-		list.add("简单文件分类");
+		list.add("文件夹");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -88,7 +89,7 @@ public class ProcessUtil {
 	 */
 	public static Map<String, String> getProcessCategoryMethod() {
 		Map<String, String> result = new HashMap<>();
-		result.put("简单文件分类", "default");
+		result.put("文件夹", "default");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -116,7 +117,7 @@ public class ProcessUtil {
 	 */
 	public static JSONObject getProcessMethods() {
 		JSONObject result = new JSONObject();
-		result.put("default", "简单文件分类");
+		result.put("default", "文件夹");
 		List<PALMethodModel> methodModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("process");
 		List<AppContext> listApps = AppsAPIManager.getInstance().getInstalledApps();
 		int size = listApps.size();
@@ -239,15 +240,33 @@ public class ProcessUtil {
 			}
 		}
 		PALRepositoryPropertyDao dao = new PALRepositoryPropertyDao();
+		// aris地址
 		List<PALRepositoryPropertyModel> propertyModels = dao.queryByWsId(wsId);
 		propertyModels = propertyModels.stream().filter(item -> Constant.METHOD_ARIS_URL.equals(item.getPropertyId())).collect(Collectors.toList());
-		Map<String, String> map = new HashMap<>();
+		// aris流程名称
+		List<PALRepositoryPropertyModel> arisNameModels = dao.queryByWsId(wsId);
+		arisNameModels = arisNameModels.stream().filter(item -> Constant.METHOD_ARIS_NAME.equals(item.getPropertyId())).collect(Collectors.toList());
+
+		Map<String, String> arisPathMap = new HashMap<>();
 		for (PALRepositoryPropertyModel prop : propertyModels) {
-			map.put(prop.getPlId(), StrUtil.removeAllBlack(prop.getPropertyValue()));// 去除空格
+			arisPathMap.put(prop.getPlId(), StrUtil.removeAllBlack(prop.getPropertyValue()));// 去除空格
+		}
+		Map<String, String> arisNameMap = new HashMap<>();
+		for (PALRepositoryPropertyModel prop : arisNameModels) {
+			arisNameMap.put(prop.getPlId(), StrUtil.removeAllBlack(prop.getPropertyValue()));// 去除空格
 		}
 		for (PALRepositoryModel model : list) {
-			if (map.containsKey(model.getId())) {
+			if (arisPathMap.containsKey(model.getId()) && arisNameMap.containsKey(model.getId())) {
-				propValMap.put(model.getId(), map.get(model.getId()));
+				List<String> pathList = new ArrayList<>();
+				// 地址为空不记录
+				if (UtilString.isEmpty(arisPathMap.get(model.getId()))) {
+					continue;
+				}
+				pathList.add(arisPathMap.get(model.getId()));
+				if (UtilString.isNotEmpty(arisNameMap.get(model.getId()))) {
+					pathList.add(arisNameMap.get(model.getId()));
+				}
+				propValMap.put(model.getId(), StringUtils.join(pathList, "\\"));
 			}
 		}
 		return propValMap;

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readtable/ReadTable.java

@@ -259,7 +259,7 @@ public class ReadTable {
                         fieldMap.put("标题", title);
                         fileFieldMap.put("标题", new WordField<>(title));
                         titleover = 1;
-                        log.info("识别的标题为：" + title);
+                        //log.info("识别的标题为：" + title);
                         continue;
                     }
                 }

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/Constant.java

@@ -4,30 +4,65 @@ public class Constant {
 
     public final static String APP_ID = "com.actionsoft.apps.coe.pal.datamigration";
     public final static String UPFILE = "migration";
-    public final static String WORDIMPORT = "[{\"title\":\"基本信息\",\"type\":\"DirectFeild\"},{\"title\":\"文控信息\",\"type\":\"DirectFeild\"},{\"title\":\"修订记录\",\"type\":\"VerticalFeild\"},{\"title\":\"术语\",\"type\":\"Table\"},{\"title\":\"组织/角色与职责\",\"type\":\"Table\"},{\"title\":\"相关文件\",\"type\":\"File\"},{\"title\":\"支持文件\",\"type\":\"File\"}]";
+    public final static String WORDIMPORT = "[{\"title\":\"基本信息\",\"type\":\"DirectFeild\"}," +
+            "{\"title\":\"文控信息\",\"type\":\"DirectFeild\"}," +
+            "{\"title\":\"修订记录\",\"type\":\"VerticalFeild\"}," +
+            "{\"title\":\"文件变更履历表\",\"type\":\"VerticalFeild\"}," +
+            "{\"title\":\"术语\",\"type\":\"Table\"}," +
+            "{\"title\":\"术语定义\",\"type\":\"Table\"}," +
+            "{\"title\":\"专业术语\",\"type\":\"Table\"}," +
+            "{\"title\":\"组织/角色与职责\",\"type\":\"Table\"}," +
+            "{\"title\":\"组织职责\",\"type\":\"Table\"}," +
+            "{\"title\":\"组织与职责\",\"type\":\"Table\"}," +
+            "{\"title\":\"相关文件\",\"type\":\"File\"}," +
+            "{\"title\":\"支持文件\",\"type\":\"File\"}" +
+            "]";
     //public final static String NAMETOID = "[{\"title\":\"目的\",\"type\":\"goal\"},{\"title\":\"拟制/修订人\",\"type\":\"reviser\"},{\"title\":\"拟制/修订日期\",\"type\":\"reviseddate\"},{\"title\":\"审核人\",\"type\":\"auditor\"},{\"title\":\"复核人\",\"type\":\"reviewer\"},{\"title\":\"审批人\",\"type\":\"approver\"},{\"title\":\"术语\",\"type\":\"term\"},{\"title\":\"术语定义\",\"type\":\"definition\"},{\"title\":\"组织/角色名称\",\"type\":\"Character\"},{\"title\":\"组织/角色职责\",\"type\":\"responsibilities\"},{\"title\":\"相关文件\",\"type\":\"relevant\"},{\"title\":\"支持文件\",\"type\":\"support\"},{\"title\":\"相关知识\",\"type\":\"related\"},{\"title\":\"附则\",\"type\":\"supplementary\"}]";
     public final static String NAMETOID = "[{\"title\":\"目的\",\"type\":\"Purpose\"}," +
             "{\"title\":\"拟制/修订人\",\"type\":\"Drafted_and_revised_by\"}," +
+            "{\"title\":\"拟制人\",\"type\":\"Drafted_and_revised_by\"}," +
             "{\"title\":\"拟制/修订日期\",\"type\":\"Drafted_and_revised_date\"}," +
+            "{\"title\":\"下发日期\",\"type\":\"Drafted_and_revised_date\"}," +
             "{\"title\":\"审核人\",\"type\":\"auditor\"}," +
+            "{\"title\":\"审核\",\"type\":\"auditor\"}," +
             "{\"title\":\"复核人\",\"type\":\"reviewer\"}," +
+            "{\"title\":\"复审\",\"type\":\"reviewer\"}," +
             "{\"title\":\"审批人\",\"type\":\"approver\"}," +
+            "{\"title\":\"审批\",\"type\":\"approver\"}," +
+            "{\"title\":\"批准人\",\"type\":\"approver\"}," +
             "{\"title\":\"术语\",\"type\":\"term\"}," +
             "{\"title\":\"组织/角色名称\",\"type\":\"Organizational_role\"}," +
             "{\"title\":\"组织/角色与职责\",\"type\":\"Organization_and_role_responsibilities\"}," +
+            "{\"title\":\"组织职责\",\"type\":\"Organization_and_role_responsibilities\"}," +
+            "{\"title\":\"组织与职责\",\"type\":\"Organization_and_role_responsibilities\"}," +
             "{\"title\":\"相关文件\",\"type\":\"relevant_flies\"}," +
             "{\"title\":\"支持文件\",\"type\":\"support_files\"}," +
             "{\"title\":\"相关知识\",\"type\":\"relevant_flies\"}," +
             "{\"title\":\"附则\",\"type\":\"T_supplementary_articles\"}," +
-            "{\"title\":\"L1\",\"type\":\"Process_Architecture_L1\"}," +
+            //"{\"title\":\"L1\",\"type\":\"Process_Architecture_L1\"}," +
-            "{\"title\":\"L2\",\"type\":\"Process_Architecture_L2\"}," +
+            //"{\"title\":\"L2\",\"type\":\"Process_Architecture_L2\"}," +
-            "{\"title\":\"L3\",\"type\":\"Process_Architecture_L3\"}," +
+            //"{\"title\":\"L3\",\"type\":\"Process_Architecture_L3\"}," +
             "{\"title\":\"文件编码\",\"type\":\"file_number\"}," +
             "{\"title\":\"适用范围\",\"type\":\"application\"}," +
+            "{\"title\":\"发放范围\",\"type\":\"application\"}," +
+            "{\"title\":\"范围\",\"type\":\"application\"}," +
             "{\"title\":\"版本\",\"type\":\"versions\"}," +
             "{\"title\":\"生效日期\",\"type\":\"effective_date\"}," +
+            "{\"title\":\"实施日期\",\"type\":\"effective_date\"}," +
+            "{\"title\":\"日期\",\"type\":\"effective_date\"}," +
             "{\"title\":\"修订内容及理由\",\"type\":\"Contents_and_reasons_for_revision\"}," +
-            "{\"title\":\"拟制/修订单位\",\"type\":\"Drafted_and_revised_Company\"}]";
+            "{\"title\":\"修订内容\",\"type\":\"Contents_and_reasons_for_revision\"}," +
+            "{\"title\":\"拟制/修订单位\",\"type\":\"Drafted_and_revised_Company\"}," +
+            "{\"title\":\"拟制部门\",\"type\":\"Drafted_and_revised_Company\"}," +
+            "{\"title\":\"编制\",\"type\":\"Drafted_and_revised_Company\"}," +
+            "{\"title\":\"术语定义\",\"type\":\"term\"}," +
+            "{\"title\":\"专业术语\",\"type\":\"term\"}," +
+            "{\"title\":\"文件编号\",\"type\":\"file_number\"}," +
+            "{\"title\":\"版号\",\"type\":\"versions\"}," +
+            "{\"title\":\"拟定日期\",\"type\":\"Drafted_and_revised_date\"}," +
+            "{\"title\":\"制发日期\",\"type\":\"Drafted_and_revised_date\"}," +
+            //"{\"title\":\"制发日期\",\"type\":\"Drafted_and_revised_date\"}," +
+            "]";
     // 构造连线时的几个固定参数
     public final static double ANGLE_RIGHT = 0;
     public final static double ANGLE_DOWN = 1.5707963267948968;

com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/readword/ReadWordUtil.java

@@ -96,7 +96,7 @@ public class ReadWordUtil {
                     WordField tmp = fileFieldMap.get(key);
                     if (tmp != null) {
                         //如果是术语~则特殊处理 还有相关文件
-                        if ("术语".equals(key)) {
+                        if ("术语".equals(key) || "术语定义".equals(key) || "专业术语".equals(key) ) {
                             List nowdata = (List) tmp.getData();
                             JSONObject jsonObject = new JSONObject();
                             jsonObject.put("name", "术语");
@@ -108,7 +108,7 @@ public class ReadWordUtil {
                             jsonArray.add(jsonObject1);
                             //存表格  将名称过滤掉
                             nowdata.stream().filter(datatmp -> {
-                                return !"名称".equals(((List) datatmp).get(0));
+                                return !"名称".equals(((List) datatmp).get(0)) && !"名词".equals(((List) datatmp).get(0)) && !"无".equals(((List) datatmp).get(0));
                             }).forEach(datatmp -> {
                                 JSONObject tmpjb = new JSONObject();
                                 tmpjb.put("name", ((List) datatmp).get(0));
@@ -119,7 +119,7 @@ public class ReadWordUtil {
                             });
                             jsonObject.put("table", jsonArray);
                             new CoeProcessLevelWeb(userContext).moreAttrContentSave(id, "term", jsonObject.toJSONString());
-                        } else if ("组织/角色与职责".equals(key)) {
+                        } else if ("组织/角色与职责".equals(key) || "组织职责".equals(key) || "组织与职责".equals(key)) {
                             List nowdata = (List) tmp.getData();
                             JSONObject jsonObject = new JSONObject();
                             jsonObject.put("name", "组织角色");
@@ -131,7 +131,7 @@ public class ReadWordUtil {
                             jsonArray.add(jsonObject1);
                             //存表格  将名称过滤掉
                             nowdata.stream().filter(datatmp -> {
-                                return !"组织/角色名称".equals(((List) datatmp).get(0));
+                                return !"组织/角色名称".equals(((List) datatmp).get(0)) && !"组织".equals(((List) datatmp).get(0));
                             }).forEach(datatmp -> {
                                 JSONObject tmpjb = new JSONObject();
                                 tmpjb.put("name", ((List) datatmp).get(0));
@@ -237,6 +237,7 @@ public class ReadWordUtil {
             //XWPFDocument doc = new XWPFDocument(file);
             Range range = doc.getRange();
             boolean isDepart = false;
+            //0，1是计算标题  2是标题计算完毕
             int titleover = 0;
             for (int i = 0; i < range.numParagraphs(); i++) {
                 Paragraph nowPara = range.getParagraph(i);
@@ -263,21 +264,78 @@ public class ReadWordUtil {
                 if (titleover == 1) {
                     titleover = 2;
                 }
-                WordAttribute wordAttribute = wordAttributeMap.get(text.trim());
+                text = text.replace("\r", "").replace("\b", "").replace("\t", "").replace("\f", "").replaceAll(" ","");
-                if ("目的".equals(text.trim())) {
+                if(text.isEmpty()){
+                    continue;
+                }
+                if(text.length() > 0 && titleover == 2){
+                    //判断是否是标题后直接为表格~~
+                    if(nowPara.isInTable()){
+                        Table table = range.getTable(nowPara);
+                        Map<String, List<String>> verticalTableText = this.getVerticalTableText(table);
+                        for (String key : verticalTableText.keySet()) {
+                            List<String> values = verticalTableText.get(key);
+                            fieldMap.put(key, values.get(0));
+                            fileFieldMap.put(key, new WordField<>(values.get(0)));
+                        }
+                        i += table.numParagraphs();
+                        titleover = 3;
+                        continue;
+                    }
+                    //判断是否是标题后直接为key：value
+                    if(text.contains("：") ){
+                        boolean flag = true;
+                        while (flag){
+                            String[] strarr = text.split("：");
+                            String tmpkey = strarr[0];
+                            if(nameToIdMap.containsKey(tmpkey)){
+                                fieldMap.put(tmpkey, strarr[1]);
+                                fileFieldMap.put(tmpkey, new WordField<>(strarr[1]));
+                            }
+                            i = i + 1 > range.numParagraphs() ? i : i + 1;
+                            Paragraph tmpPara = range.getParagraph(i);
+                            text = tmpPara.text().replace("\r", "").replace("\b", "").replace("\t", "").replace("\f", "").replaceAll(" ","");
+                            if(text.length() > 0 && !text.contains("：") || text.contains("目的")){
+                               flag = false;
+                                i = i-1;
+                            }
+                        }
+                        titleover = 3;
+                        continue;
+                    }
+                }
+                //最后是正常情况
+                //获取正确的key
+                String tmpkey = text.trim();
+                if(tmpkey.contains(".")){
+                    String[] tmparr = tmpkey.split("\\.");
+                    if(tmparr.length == 2){
+                        tmpkey = tmparr[1];
+                    }
+                }
+                if (!tmpkey.isEmpty() && ("目的".equals(tmpkey) || ("目的：").equals(tmpkey))) {
                     int index = i + 1 > range.numParagraphs() ? i : i + 1;
                     Paragraph tmpPara = range.getParagraph(index);
                     fieldMap.put("目的", tmpPara.text());
                     fileFieldMap.put("目的", new WordField<>(tmpPara.text()));
                     continue;
                 }
-                if ("附则".equals(text.trim())) {
+                if(!tmpkey.isEmpty() && "2.适用范围：".contains(tmpkey)){
+                    int index = i + 1 > range.numParagraphs() ? i : i + 1;
+                    Paragraph tmpPara = range.getParagraph(index);
+                    fieldMap.put("适用范围", tmpPara.text());
+                    fileFieldMap.put("适用范围", new WordField<>(tmpPara.text()));
+                    continue;
+                }
+                if ("附则".equals(tmpkey)) {
                     int index = i + 1 > range.numParagraphs() ? i : i + 1;
                     Paragraph tmpPara = range.getParagraph(index);
                     fieldMap.put("附则", tmpPara.text());
                     fileFieldMap.put("附则", new WordField<>(tmpPara.text()));
                     continue;
                 }
+
+                WordAttribute wordAttribute = wordAttributeMap.get(tmpkey);
                 if (null == wordAttribute) {
                     continue;
                 }
@@ -338,8 +396,8 @@ public class ReadWordUtil {
                         Table table = range.getTable(paragraph);
                         Map<String, List<String>> verticalTableText = this.getVerticalTableText(table);
 
-                        if (text.trim().equals("修订记录")) {
+                        if (text.trim().equals("修订记录") || text.replaceAll(" ","").equals("文件变更履历表")) {
-                            List<String> strings = verticalTableText.get("版本");
+                            List<String> strings = verticalTableText.get("版本") != null ? verticalTableText.get("版本") : verticalTableText.get("版本号");
                             int subIndex = 0;
                             for (int j = 0; j < strings.size(); j++) {
                                 String s = strings.get(j);
@@ -377,7 +435,7 @@ public class ReadWordUtil {
                     int index = i + 1 > range.numParagraphs() ? i : i + 1;
                     Paragraph paragraph = range.getParagraph(index);
                     if (paragraph.isInTable()) {
-                        if ("相关文件，支持文件".contains(text.trim())) {
+                        if (!text.trim().isEmpty() && "相关文件，支持文件".contains(text.trim())) {
                             //取文件名名称即可
                             Table table = range.getTable(paragraph);
                             Map<String, List<String>> verticalTableText = this.getVerticalTableText(table);
@@ -602,7 +660,7 @@ public class ReadWordUtil {
             fontName = characterRun.getFontName();
             if (fontName.contains("黑体") && !type) {
                 //与文档fontsize标号2倍关系 ，黑体一号 等于 26号size
-                return characterRun.isBold() && characterRun.getFontSize() == 52;
+                return characterRun.isBold() && (characterRun.getFontSize() == 52 || characterRun.getFontSize() == 48 || characterRun.getFontSize() == 72);
             }
             if (fontName.contains("宋体") && type) {
                 return characterRun.isBold() && (characterRun.getFontSize() == 21 || characterRun.getFontSize() == 36);

com.actionsoft.apps.coe.pal.output.pr/manifest.xml

@@ -3,7 +3,7 @@
 <app xmlns="http://www.actionsoft.com.cn/app">  
   <name>流程手册</name>  
   <version>1.0</version>  
-  <buildNo>29</buildNo>  
+  <buildNo>30</buildNo>  
   <developer id="776cca9a287c8b4d63b9cad216aa3859" tablePrefix="ACT" url="http://www.actionsoft.com.cn">北京炎黄盈动科技发展有限责任公司</developer>  
   <productId>6636fc53728276eb3baca55938356b74</productId>  
   <categoryVisible>false</categoryVisible>  

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java

@@ -192,24 +192,20 @@ public class Report1Gener {
 		PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId);
 
 		//流程绩效
+		JSONArray processKpi = new JSONArray();
 		List<DesignerShapeRelationModel> metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics");
-		if (metrics.size() == 0) {
+		if (metrics.size() != 0) {
-			dataMap.put("pl_Name_process_performance_indicator", "");
-			dataMap.put("pl_set_the_purpose", "");
-			dataMap.put("pl_Index_definition", "");
-			dataMap.put("pl_computational_formula", "");
-			dataMap.put("pl_data_sources", "");
-			dataMap.put("pl_unit_measurement", "");
-			dataMap.put("pl_statistical_period", "");
-			dataMap.put("pl_explain", "");
-
-		}else {
 			for (DesignerShapeRelationModel relation : metrics) {
+				JSONObject processObj = new JSONObject();
 				String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
 				String relationShapeId = relation.getRelationShapeId();//实例ID
 				//System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
 				List<Map<String, Object>> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容
 				for (Map<String, Object> entry : relations) {
+					String id = (String)entry.get("id");
+					if (id == null || !id.equals(relationShapeId)){
+						continue;
+					}
 					Object attributes = entry.get("attributes");
 					String resultJson = attributes.toString();
 					JSONArray object= JSONArray.parseArray(resultJson);
@@ -218,39 +214,44 @@ public class Report1Gener {
 						//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
 						if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_Name_process_performance_indicator", value);
+							processObj.put("pl_Name_process_performance_indicator", value);
 						}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_set_the_purpose", value);
+							processObj.put("pl_set_the_purpose", value);
 						}else if (key.equals("Index_definition")){//指标定义     Index_definition
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_Index_definition", value);
+							processObj.put("pl_Index_definition", value);
 						}else if (key.equals("computational_formula")){//计算公式    computational_formula
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_computational_formula", value);
+							processObj.put("pl_computational_formula", value);
 						}else if (key.equals("data_sources")){//数据来源     data_sources
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_data_sources", value);
+							processObj.put("pl_data_sources", value);
 						}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_unit_measurement", value);
+							processObj.put("pl_unit_measurement", value);
 						}else if (key.equals("statistical_period")){//统计周期      statistical_period
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_statistical_period", value);
+							processObj.put("pl_statistical_period", value);
 						}else if (key.equals("explain")){//说    明     explain
 							String value = object.getJSONObject(i).getString("value");
-							dataMap.put("pl_explain", value);
+							processObj.put("pl_explain", value);
 						}
 					}
 				}
+				processKpi.add(processObj);
 			}
 		}
+		dataMap.put("pl_process_kpi_list",processKpi);
 		dataMap.put("organizationType", "涉及部门及岗位\\角色");
 		if (repositoryModel == null) {
 			return null;
 		}
 		prReportComment.getCommentContent(dataMap, repositoryModel);//获取一些公共的数据(手册首页的手册岗位名称、部门、时间等)
 		JSONArray repositoryShapeTable = new JSONArray();//流程步骤Table
+
+
+
 		JSONArray fileTable = new JSONArray(); //流程附件Table
 		JSONArray dangerTable = new JSONArray(); //风险Table
 		JSONArray regulateTable = new JSONArray(); //控制Table
@@ -282,13 +283,45 @@ public class Report1Gener {
 				file.mkdir();
 			}
 		}
+
+		//文件属性附件处理
+		int fileIndex = 1;
+		if (search != null && search.size() > 0) {
+			// 复制附件
+			for (UpfileModel upfileModel : search) {
+				if (!"f".equals(upfileModel.getType())) {// 文件
+					continue;
+				}
+				// 复制doccenter下的文件
+				DCContext dcContext = null;
+				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+				if (dcProfile != null) {
+					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
+				}
+				File sourceFile = new UtilFile(dcContext.getFilePath());
+				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+				try {
+					UtilFile.copyFile(sourceFile, targetFile);
+				} catch (Exception e) {
+					System.out.println(e);
+					e.printStackTrace();
+				}
+				JSONObject object = new JSONObject();
+				object.put("file_name", fileIndex + "." + upfileModel.getFileName());
+				String link = fileName + File.separator + upfileModel.getFileName();
+				object.put("link", link);
+				fileTable.add(object);
+				fileIndex++;
+			}
+		}
+		//流程说明
 		if (repositoryFileElements != null) {
 			int index = 1;// 流程步骤序号
 			int dangerIndex = 1;// 风险序号
 			int regulateIndex = 1;// 控制序号
 			for (Map<String, Object> shape : repositoryFileElements) {
-				//如果图形元素不是流程步骤，不导出该元素
+				//过滤导出的图形类型
-				if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) {
+				if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4".indexOf((String)shape.get("type")) == -1) {
 					continue;
 				}
 				JSONObject _tr = new JSONObject();
@@ -330,10 +363,11 @@ public class Report1Gener {
 							e.printStackTrace();
 						}
 						JSONObject object = new JSONObject();
-						object.put("shape_file_name", upfileModel.getFileName());
+						object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName());
 						String link = fileName + File.separator + upfileModel.getFileName();
 						object.put("shape_file_link", link);
 						shapeFileTable.add(object);
+						fileIndex++;
 					}
 				}
 				if(shapeFileTable.size() == 0) {// 没有附件时给空值，不然使用office打开会解析错误
@@ -382,36 +416,6 @@ public class Report1Gener {
 		// 流程步骤的指标表格
 		setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
 
-		if (search != null && search.size() > 0) {
-			// 复制附件
-			int index = 1;
-			for (UpfileModel upfileModel : search) {
-				if (!"f".equals(upfileModel.getType())) {// 文件
-					continue;
-				}
-				// 复制doccenter下的文件
-				DCContext dcContext = null;
-				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
-				if (dcProfile != null) {
-					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
-				}
-				File sourceFile = new UtilFile(dcContext.getFilePath());
-				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
-				try {
-					UtilFile.copyFile(sourceFile, targetFile);
-				} catch (Exception e) {
-					System.out.println(e);
-					e.printStackTrace();
-				}
-				JSONObject object = new JSONObject();
-				object.put("file_name", index + "." + upfileModel.getFileName());
-				String link = fileName + File.separator + upfileModel.getFileName();
-				object.put("link", link);
-				fileTable.add(object);
-				index++;
-			}
-		}
-
 		JSONArray termTable = new JSONArray(); //术语定义Table
 		// 属性特征 属性代码KEY
 		PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
@@ -499,33 +503,6 @@ public class Report1Gener {
 			}
 		}
 
-
-
-			//System.out.println(relations+"==========relations");
-			/*if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序
-				OutputWordUtil.orderByNumber(relations);
-			}*/
-
-
-
-
-
-		// 2张表
-		// 文件属性内容（文本内容）表
-		// 文件属性内容关联表
-
-		// 根据绩效所属模型查询绩效形状的详细信息
-
-
-
-		// 流程文件属性术语与定义（表格类型）
-
-
-
-		// 流程文件属性绩效形状的信息
-
-		// 流程文件属性相关文件和支持文件
-
 		//术语
 		dataMap.put("term_table", termTable);//table4
 		dataMap.put("term_table_count", termTable.size());//table4
@@ -545,7 +522,7 @@ public class Report1Gener {
 		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
 		dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
 		dataMap.put("file_table", fileTable);
-		dataMap.put("file_table_count", fileTable.size());
+		dataMap.put("file_table_count", fileIndex);
 		dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
 		dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
 		dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java

@@ -1,22 +1,37 @@
 package com.actionsoft.apps.coe.pal.output.pr.report2;
 
+import java.io.File;
 import java.util.*;
 
+import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment;
+import com.actionsoft.apps.coe.pal.output.pr.util.ReportRepositoryCompare;
 import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile;
 import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel;
 import com.actionsoft.apps.coe.pal.pal.output.util.OutputExcelUtil;
 import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil;
+import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache;
+import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
 import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil;
+import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
+import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
+import com.actionsoft.bpms.server.DispatcherRequest;
+import com.actionsoft.bpms.server.UserContext;
+import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
+import com.actionsoft.bpms.util.UtilFile;
+import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.sdk.local.SDK;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -38,6 +53,7 @@ public class Report2Gener {
 	// 防止生成过程中，停用或卸载该app
 	public static boolean isRunning = false;
 	public static final Object _lock = new Object();
+	private UserContext userContext = null;
 	GenerLogExd log = new GenerLogExd();
 	public Report2Gener() {
 	}
@@ -57,6 +73,7 @@ public class Report2Gener {
 		try {
 			synchronized (_lock) {
 				isRunning = true;
+				userContext = DispatcherRequest.getUserContext();
 				String teamId = model.getTeamId();
 				String wsId = model.getWsId();
 				log.info("execute ready...");
@@ -68,7 +85,7 @@ public class Report2Gener {
 				// ----预处理、校验----
 				OutputAppProfile appModel = OutputAppManager.getProfile(model.getProfileId());
 				String tempPath = appModel.getAppContext().getPath();
-				String tempName = "步骤竖表-流程手册.xml";
+				String tempName = "步骤竖表-流程手册2.xml";
 				log.info("begin...");
 				log.info("-------------------");
 				// ----文件处理-----
@@ -120,18 +137,21 @@ public class Report2Gener {
 					reportNameValue = reportNameValue.substring(0, 255);
 				}
 				String docName = "";
+				String fileName = "";
 				if (indexMap.containsKey(reportNameValue)) {
 					int index = indexMap.get(reportNameValue);
 					index++;
-					log.info("得到word名称为:" + reportNameValue + "(" + index + ")");
+					fileName = reportNameValue + "(" + index + ")";
-					docName = docPath + reportNameValue + "(" + index + ")" + ".doc";
+					log.info("得到word名称为:" + fileName);
+					docName = docPath + fileName + ".doc";
 					indexMap.put(reportNameValue, index);
 				} else {
-					log.info("得到word名称为:" + reportNameValue);
+					fileName = reportNameValue;
-					docName = docPath + reportNameValue + ".doc";
+					log.info("得到word名称为:" + fileName);
-					indexMap.put(reportNameValue, 1);
+					docName = docPath + fileName + ".doc";
+					indexMap.put(fileName, 1);
 				}
-				JSONObject dataMap = getData(repositoryId, wizardJsonData);
+				JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName);
 				if (dataMap != null) {
 					OutputWordUtil.createDoc(dataMap, tempPath, tempName, docName);
 				}
@@ -139,135 +159,355 @@ public class Report2Gener {
 		}
 	}
 
-	private JSONObject getData(String repositoryId, JSONObject wizardJsonData) {
+	private JSONObject getData(String repositoryId, JSONObject wizardJsonData, String docPath, String fileName) {
 		JSONObject dataMap = new JSONObject();
 		boolean raciRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal.output.pr", "DETY_POSITION_ROLE_RELATION_TYPE", false);
 
-		dataMap.put("organizationType1", "涉及部门");
+		// 记录关联属性的流程节点，防止多次查询重复文件信息耗费时间
-		dataMap.put("organizationType2", "涉及岗位\\角色");
+		Set<String> relationFileIds = new HashSet<>();
+		Map<String, Map<String, Object>> relationFileMap = new HashMap<>();
+
 		PrReportComment prReportComment = new PrReportComment();
-		PALRepositoryModel repositoryModel = PALRepositoryCache.getCache().get(repositoryId);
+		PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId);
+
+		//流程绩效
+		JSONArray processKpi = new JSONArray();
+		List<DesignerShapeRelationModel> metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics");
+		if (metrics.size() != 0) {
+			for (DesignerShapeRelationModel relation : metrics) {
+				JSONObject processObj = new JSONObject();
+				String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+				String relationShapeId = relation.getRelationShapeId();//实例ID
+				//System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
+				List<Map<String, Object>> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容
+				for (Map<String, Object> entry : relations) {
+					String id = (String)entry.get("id");
+					if (id == null || !id.equals(relationShapeId)){
+						continue;
+					}
+					Object attributes = entry.get("attributes");
+					String resultJson = attributes.toString();
+					JSONArray object= JSONArray.parseArray(resultJson);
+					for(int i=0; i<object.size(); i++) {
+						String key = object.getJSONObject(i).getString("key");
+						//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
+						if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_Name_process_performance_indicator", value);
+						}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_set_the_purpose", value);
+						}else if (key.equals("Index_definition")){//指标定义     Index_definition
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_Index_definition", value);
+						}else if (key.equals("computational_formula")){//计算公式    computational_formula
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_computational_formula", value);
+						}else if (key.equals("data_sources")){//数据来源     data_sources
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_data_sources", value);
+						}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_unit_measurement", value);
+						}else if (key.equals("statistical_period")){//统计周期      statistical_period
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_statistical_period", value);
+						}else if (key.equals("explain")){//说    明     explain
+							String value = object.getJSONObject(i).getString("value");
+							processObj.put("pl_explain", value);
+						}
+					}
+				}
+				processKpi.add(processObj);
+			}
+		}
+		dataMap.put("pl_process_kpi_list",processKpi);
+		dataMap.put("organizationType", "涉及部门及岗位\\角色");
 		if (repositoryModel == null) {
 			return null;
 		}
-		prReportComment.getCommentContent(dataMap, repositoryModel); // 获取一些公共的数据(手册首页的手册岗位名称、部门、时间等)
+		prReportComment.getCommentContent(dataMap, repositoryModel);//获取一些公共的数据(手册首页的手册岗位名称、部门、时间等)
+		JSONArray repositoryShapeTable = new JSONArray();//流程步骤Table
 
-		JSONArray repositoryShapeTable = new JSONArray(); // 流程步骤table
-		JSONArray shapeDangerTable = new JSONArray(); // 流程步骤的风控要求table
-		JSONArray shapeKPITable = new JSONArray(); // 流程步骤的量化指标table
 
+
+		JSONArray fileTable = new JSONArray(); //流程附件Table
+		JSONArray dangerTable = new JSONArray(); //风险Table
+		JSONArray regulateTable = new JSONArray(); //控制Table
+		JSONArray KPITable = new JSONArray(); //相关绩效考核Table
 		Set<String> dangerSet = new HashSet<String>();// 风险
-		Set<String> kpiSet = new HashSet<>();// kpi
+		Set<String> regulateSet = new HashSet<String>();// 控制
-		Map<String, Map<String, Object>> relationFileMap = new HashMap<>();
+		Set<String> KPISet = new HashSet<String>();// kpi
-
 		List<Map<String, Object>> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容
 		if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序
 			OutputWordUtil.orderByNumber(repositoryFileElements);
 		}
+
+		// 流程附件列表
+		UpFileDao upFileDao = new UpFileDao();
+		StringBuffer sqlWhere = new StringBuffer();
+		sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'");
+		List<UpfileModel> search = upFileDao.search(sqlWhere.toString());
+		File file = null;
+		//三员管理下，用户密级与文件密级过滤显示
+		if(HighSecurityUtil.isON()){
+			PALRepositoryQueryAPIManager.getInstance().upFileSecurityFilter(this.userContext,search);
+		}
+		if (search != null && search.size() > 0) {
+			//创建附件目录及复制附件
+			fileName = fileName + "_file";
+			file = new File(docPath, fileName);
+			if (!file.exists()) {
+				log.info("创建附件");
+				file.mkdir();
+			}
+		}
+
+		//文件属性附件处理
+		int fileIndex = 1;
+		if (search != null && search.size() > 0) {
+			// 复制附件
+			for (UpfileModel upfileModel : search) {
+				if (!"f".equals(upfileModel.getType())) {// 文件
+					continue;
+				}
+				// 复制doccenter下的文件
+				DCContext dcContext = null;
+				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+				if (dcProfile != null) {
+					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
+				}
+				File sourceFile = new UtilFile(dcContext.getFilePath());
+				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+				try {
+					UtilFile.copyFile(sourceFile, targetFile);
+				} catch (Exception e) {
+					System.out.println(e);
+					e.printStackTrace();
+				}
+				JSONObject object = new JSONObject();
+				object.put("file_name", fileIndex + "." + upfileModel.getFileName());
+				String link = fileName + File.separator + upfileModel.getFileName();
+				object.put("link", link);
+				fileTable.add(object);
+				fileIndex++;
+			}
+		}
+		//流程说明
 		if (repositoryFileElements != null) {
 			int index = 1;// 流程步骤序号
 			int dangerIndex = 1;// 风险序号
-			int kpiIndex = 1;// 指标序号
+			int regulateIndex = 1;// 控制序号
 			for (Map<String, Object> shape : repositoryFileElements) {
-				//如果图形元素不是流程步骤，不导出该元素
+				//过滤导出的图形类型
-				if (PrReportComment.PROCESS_STEP.indexOf((String) shape.get("type")) == -1) {
+				if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4".indexOf((String)shape.get("type")) == -1) {
 					continue;
 				}
-				boolean containDangerAttribute = false;
-				boolean containKPIAttribute = false;
 				JSONObject _tr = new JSONObject();
 				OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr);	//设置默认值
 				_tr.put(OutputWordUtil.SERIAL_NUMBER, index);	//序号
 				_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", "")));	//流程名称
 				_tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING));	//步骤名称
+
+				/**序号改为流程编号**/
+				/*_tr.put(OutputWordUtil.SERIAL_NUMBER, "");	//序号置空
+				if (shape.containsKey("number")) {
+					_tr.put(OutputWordUtil.SERIAL_NUMBER, shape.get("number"));
+				}*/
+				/**序号改为流程编号**/
+
+				// 节点的附件处理
+				JSONArray shapeFileTable = new JSONArray(); //流程节点附件Table
+				if (search != null && search.size() > 0) {
+					// 复制附件
+					for (UpfileModel upfileModel : search) {
+						if ("f".equals(upfileModel.getType())) {
+							continue;
+						}
+						if (!shape.get("id").equals(upfileModel.getShape_uuid())) {
+							continue;
+						}
+						// 复制doccenter下的文件
+						DCContext dcContext = null;
+						DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+						if (dcProfile != null) {
+							dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, upfileModel.getPl_uuid(), upfileModel.getShape_uuid(), upfileModel.getFileName());
+						}
+						File sourceFile = new UtilFile(dcContext.getFilePath());
+						File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+						try {
+							UtilFile.copyFile(sourceFile, targetFile);
+						} catch (Exception e) {
+							System.out.println(e);
+							e.printStackTrace();
+						}
+						JSONObject object = new JSONObject();
+						object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName());
+						String link = fileName + File.separator + upfileModel.getFileName();
+						object.put("shape_file_link", link);
+						shapeFileTable.add(object);
+						fileIndex++;
+					}
+				}
+				if(shapeFileTable.size() == 0) {// 没有附件时给空值，不然使用office打开会解析错误
+					JSONObject object = new JSONObject();
+					object.put("shape_file_name", "");
+					object.put("shape_file_link", "");
+					shapeFileTable.add(object);
+				}
+				_tr.put("shape_File_Table", shapeFileTable);
+
 				JSONArray dataAttributes = (JSONArray) shape.get("attributes");
-				// 组织（部门）、员工
-				List<String> dutyROrgList = new ArrayList<>();
-				List<String> approvalAOrgAList = new ArrayList<>();
-				List<String> counselorCOrgList = new ArrayList<>();
-				List<String> notifyIOrgList = new ArrayList<>();
-				// 岗位、员工
-				List<String> dutyRRoleList = new ArrayList<>();
-				List<String> approvalARoleAList = new ArrayList<>();
-				List<String> counselorCRoleList = new ArrayList<>();
-				List<String> notifyIRoleList = new ArrayList<>();
-				Map<String, List<DesignerShapeRelationModel>> map = OutputWordUtil.getShapeRelationAttrMap(repositoryId, shape.get("id").toString());
 				if (!dataAttributes.isEmpty()) {
 					for (int i = 0; i < dataAttributes.size(); i++) {
 						JSONObject obj = dataAttributes.getJSONObject(i);
 						String attrId = obj.getString("key");
 						String attrValue = obj.getString("value");
 						_tr.put("shape_" + attrId, attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-						if ("bpm_duty_r,bpm_approval_a,bpm_counselor_c,bpm_notify_i,duty_r,approval_a,counselor_c,notify_i".contains(attrId)) {
 						if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
-								dataMap.put("organizationType1", "涉及部门\\人员");
-								dataMap.put("organizationType2", "涉及岗位\\角色");
 							if ("bpm_duty_r".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_duty_r", dutyROrgList, dutyRRoleList);
+								_tr.put("shape_duty_r", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-								} else if ("bpm_approval_a".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_approval_a", approvalAOrgAList, approvalARoleAList);
-								} else if ("bpm_counselor_c".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_counselor_c", counselorCOrgList, counselorCRoleList);
-								} else if ("bpm_notify_i".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_notify_i", notifyIOrgList, notifyIRoleList);
 							}
-							} else {
+							if ("bpm_approval_a".equals(attrId)) {
-								if ("duty_r".equals(attrId)) {
+								_tr.put("shape_approval_a", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-									raciRelationPalOrg(map, "duty_r", dutyROrgList, dutyRRoleList);
+							}
-								} else if ("approval_a".equals(attrId)) {
+							if ("bpm_counselor_c".equals(attrId)) {
-									raciRelationPalOrg(map, "approval_a", approvalAOrgAList, approvalARoleAList);
+								_tr.put("shape_counselor_c", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-								} else if ("counselor_c".equals(attrId)) {
+							}
-									raciRelationPalOrg(map, "counselor_c", counselorCOrgList, counselorCRoleList);
+							if ("bpm_notify_i".equals(attrId)) {
-								} else if ("notify_i".equals(attrId)) {
+								_tr.put("shape_notify_i", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-									raciRelationPalOrg(map, "notify_i", notifyIOrgList, notifyIRoleList);
 							}
 						}
-						}
-
 						if ("danger".equals(attrId)) {
-							JSONArray dangerTable = new JSONArray();
+							dangerIndex = setTableValueOfControlAndRisk(attrId, repositoryId, shape.get("id").toString(),dangerTable, dangerIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-							dangerIndex = setTableValueOfRiskAndKPI(attrId, repositoryId, shape.get("id").toString(),dangerTable, dangerIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
 							dangerSet.clear();
-							_tr.put(OutputWordUtil.TABLE_DANGER, dangerTable);
+						}else if ("regulate".equals(attrId)) {
-							if (dangerTable.size() > 0) {
+							regulateIndex = setTableValueOfControlAndRisk(attrId, repositoryId, shape.get("id").toString(), regulateTable, regulateIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-								containDangerAttribute = true;
+							regulateSet.clear();
-							}
-
-						} else if ("kpi".equals(attrId)) {
-							JSONArray kpiTable = new JSONArray();
-							kpiIndex = setTableValueOfRiskAndKPI(attrId, repositoryId, shape.get("id").toString(), kpiTable, kpiIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-							kpiSet.clear();
-							_tr.put(OutputWordUtil.TABLE_KPI, kpiTable);
-							if (kpiTable.size() > 0) {
-								containKPIAttribute = true;
 						}
 					}
 				}
-					_tr.put("shape_duty_r_org", StringUtils.join(dutyROrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_approval_a_org", StringUtils.join(approvalAOrgAList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_counselor_c_org", StringUtils.join(counselorCOrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_notify_i_org", StringUtils.join(notifyIOrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_duty_r_role", StringUtils.join(dutyRRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_approval_a_role", StringUtils.join(approvalARoleAList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_counselor_c_role", StringUtils.join(counselorCRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_notify_i_role", StringUtils.join(notifyIRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-				}
 				repositoryShapeTable.add(_tr);
 				index++;
-				if (containDangerAttribute) {
-					shapeDangerTable.add(_tr);
-				}
-				if (containKPIAttribute) {
-					shapeKPITable.add(_tr);
 			}
 		}
 
+		// 流程步骤的指标表格
+		setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
+
+		JSONArray termTable = new JSONArray(); //术语定义Table
+		// 属性特征 属性代码KEY
+		PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
+		if (term != null) {
+			String termVal = term.getPropertyValue();
+			JSONObject termObj = JSONObject.parseObject(termVal);
+			if (termObj != null && !termObj.isEmpty()) {
+				JSONArray tableArr = termObj.getJSONArray("table");
+				if (tableArr != null && !tableArr.isEmpty()) {
+					for (Object obj : tableArr) {
+						JSONObject obj2 = (JSONObject) obj;
+						if (!"table_head".equals(obj2.getString("id"))) {
+							String name = obj2.getString("name");
+							String desc = obj2.getString("desc");
+							JSONObject tmp = new JSONObject();
+							tmp.put("name", name);
+							tmp.put("desc", desc);
+							termTable.add(tmp);
 						}
+					}
+				}
+			}
+		}
+
+
+		JSONArray organizationTable = new JSONArray(); //组织职责Table
+		// 属性特征 属性代码KEY
+		PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
+		if (Organizational != null){
+			String OrganizationalVal = Organizational.getPropertyValue();
+			JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
+			if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
+				JSONArray tableArr = OrganizationalObj.getJSONArray("table");
+				if (tableArr != null && !tableArr.isEmpty()) {
+					for (Object obj : tableArr) {
+						JSONObject obj2 = (JSONObject) obj;
+						if (!"table_head".equals(obj2.getString("id"))) {
+							String name = obj2.getString("name");
+							String desc = obj2.getString("desc");
+							JSONObject tmp = new JSONObject();
+							tmp.put("name", name);
+							tmp.put("desc", desc);
+							organizationTable.add(tmp);
+						}
+					}
+				}
+			}
+		}
+
+
+		//支持文件
+		JSONArray supportfiles = new JSONArray(); //组织职责Table
+		List<DesignerShapeRelationModel> relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files");
+		int index = 0;
+		for (DesignerShapeRelationModel relation : relationList) {
+			String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+			PALRepositoryModel model = PALRepositoryCache.getCache().get(relationFileId);
+			if (model != null) {
+				index++;
+				String name = model.getName();
+				JSONObject tmp = new JSONObject();
+				tmp.put("name", name);
+				tmp.put("desc", index);
+
+
+				supportfiles.add(tmp);
+			}
+		}
+
+		//相关文件 R_relevant_flies
+		JSONArray relevant_flies = new JSONArray(); //组织职责Table
+		List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies");
+		int count = 0;
+		for (DesignerShapeRelationModel relation : relationList2) {
+			String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+			PALRepositoryModel model = PALRepositoryCache.getCache().get(relationFileId);
+			if (model != null) {
+				count++;
+				String name = model.getName();
+				JSONObject tmp = new JSONObject();
+				tmp.put("name", name);
+				tmp.put("desc", count);
+
+				relevant_flies.add(tmp);
+			}
+		}
+
+		//术语
+		dataMap.put("term_table", termTable);//table4
+		dataMap.put("term_table_count", termTable.size());//table4
+		//组织和职责
+		dataMap.put("organization_table", organizationTable);//table5
+		dataMap.put("organization_table_count",organizationTable.size());//table5
+		//支持文件
+		dataMap.put("supports_table", supportfiles);//table6
+		dataMap.put("supports_table_count", supportfiles.size());//table6
+		//相关文件
+		dataMap.put("relevant_table", relevant_flies);//table7
+		dataMap.put("relevant_table_count", relevant_flies.size());//table7
+		//流程绩效
+		//dataMap.put("Process_performance_metrics_table",process_performance_metrics);//table8
+		dataMap.put("metrics_count", metrics.size());//
 
 		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
-		dataMap.put(OutputWordUtil.TABLE_DANGER, shapeDangerTable);
+		dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
-		dataMap.put(OutputWordUtil.TABLE_KPI, shapeKPITable);
+		dataMap.put("file_table", fileTable);
-
+		dataMap.put("file_table_count", fileIndex);
+		dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
+		dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
+		dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);
+		ReportRepositoryCompare compare = new ReportRepositoryCompare();
+		JSONArray historyVersionModify = compare.getModifyVersionHistory(repositoryId);
+		dataMap.put("history_table", historyVersionModify);
 		return dataMap;
 	}
 
@@ -389,4 +629,123 @@ public class Report2Gener {
 		}
 	}
 
+	/**
+	 * 设置流程步骤的KPI表格
+	 * @param attrId
+	 * @param fileId
+	 * @param table
+	 * @param relationFileMap
+	 * @return
+	 */
+	public int setTableValueOfKPI(String attrId, String fileId, JSONArray table, Map<String, Map<String, Object>> relationFileMap) {
+		int index = 1;
+		JSONArray result = new JSONArray();
+		DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
+		List<DesignerShapeRelationModel> list = dao.query(fileId, null, attrId, null, null);
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			if (!relationFileMap.containsKey(relationFileId) && !UtilString.isEmpty(model.getShapeId())) {
+				Map<String, Object> shapes = new HashMap<>();
+				List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(relationFileId);
+				for (Map<String, Object> shape : fileElements) {
+					String tempShapeId = shape.get("id").toString();
+					shapes.put(tempShapeId, shape);
+				}
+				relationFileMap.put(relationFileId, shapes);
+			}
+		}
+
+		Set<String> relationShapeIdSet = new HashSet<>(); // 去重
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			String relationShapeId = model.getRelationShapeId();
+			if (relationFileMap.containsKey(relationFileId)) {
+				Map<String, Object> elements = relationFileMap.get(relationFileId);
+				if (elements != null && elements.containsKey(relationShapeId)) {
+					Map<String, Object> shape = (Map<String, Object>) elements.get(relationShapeId);
+					if (!relationShapeIdSet.contains(shape.get("id").toString())) {
+						relationShapeIdSet.add(shape.get("id").toString());
+						result.add(shape);
+					}
+				}
+			}
+		}
+
+		for (int i = 0; i < result.size(); i++) {
+			Map<String, Object> shape = result.getJSONObject(i);
+			JSONObject _tr = new JSONObject();
+			OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr);	//设置默认值
+			String name = specialCharTransfer(shape.get("text").toString());
+			_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+			_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
+			JSONArray dataAttributes = (JSONArray) shape.get("attributes");
+			for (int j = 0; j < dataAttributes.size(); j++) {
+				_tr.put("shape_" + dataAttributes.getJSONObject(j).getString("key"), specialCharTransfer(dataAttributes.getJSONObject(j).getString("value")).replace("\n", " "));
+			}
+			table.add(_tr);
+			index++;
+		}
+		return index;
+
+	}
+
+
+	public int setTableValueOfControlAndRisk(String attrId, String fileId, String shapeId, JSONArray table, int index, String processShapeName, Map<String, Map<String, Object>> relationFileMap) {
+		JSONArray result = new JSONArray();
+		DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
+		List<DesignerShapeRelationModel> list = dao.query(fileId, shapeId, attrId, null, null);
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			if (!relationFileMap.containsKey(relationFileId) && PALRepositoryCache.getCache().get(relationFileId) != null) {
+				Map<String, Object> shapes = new HashMap<>();
+				List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(relationFileId);
+				for (Map<String, Object> shape : fileElements) {
+					String tempShapeId = shape.get("id").toString();
+					shapes.put(tempShapeId, shape);
+				}
+				relationFileMap.put(relationFileId, shapes);
+			}
+		}
+
+		Set<String> relationShapeIdSet = new HashSet<>(); // 去重
+		String filterShapeName = "";
+		if ("danger".equals(attrId)) {// 风险
+			filterShapeName = "risk";
+		} else if ("regulate".equals(attrId)) {// 控制
+			filterShapeName = "control";
+		}
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			String relationShapeId = model.getRelationShapeId();
+			if (relationFileMap.containsKey(relationFileId)) {
+				Map<String, Object> elements = relationFileMap.get(relationFileId);
+				if (elements != null && elements.containsKey(relationShapeId)) {
+					Map<String, Object> shape = (Map<String, Object>) elements.get(relationShapeId);
+					if (!relationShapeIdSet.contains(shape.get("id").toString()) && filterShapeName.equals(shape.get("type"))) {
+						relationShapeIdSet.add(shape.get("id").toString());
+						result.add(shape);
+					}
+				}
+			}
+		}
+
+		for (int i = 0; i < result.size(); i++) {
+			Map<String, Object> shape = result.getJSONObject(i);
+			JSONObject _tr = new JSONObject();
+			OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr);	//设置默认值
+			String name = specialCharTransfer(shape.get("text").toString());
+			_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
+			_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+			_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
+			JSONArray dataAttributes = (JSONArray) shape.get("attributes");
+			for (int j = 0; j < dataAttributes.size(); j++) {
+				_tr.put("shape_" + dataAttributes.getJSONObject(j).getString("key"), specialCharTransfer(dataAttributes.getJSONObject(j).getString("value")).replace("\n", " "));
+			}
+			table.add(_tr);
+			index++;
+		}
+		return index;
+
+	}
+
 }

com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml

@@ -1923,7 +1923,7 @@ jM/of07/BWuyjU4AAAvwBAAAABI0Vng=
                         <w:color w:val="000000"/>
                         <w:sz w:val="52"/>
                     </w:rPr>
-                    <w:t>流程文件</w:t>
+                    <w:t></w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@@ -4932,6 +4932,7 @@ y7fdOgAAAABJRU5ErkJggk==
                <w:p wsp:rsidR="00F14252" wsp:rsidRDefault="00F14252" wsp:rsidP="00F14252">
                     <w:pPr>
                         <w:spacing w:line="360" w:line-rule="auto"/>
+                        <w:jc w:val="center"/>
                       <w:rPr>${pl_diagram}
                             <w:rFonts w:h-ansi="宋体" w:cs="Arial" w:hint="fareast"/>
                         </w:rPr>
@@ -4939,7 +4940,7 @@ y7fdOgAAAABJRU5ErkJggk==
                     <w:r>
                         <w:pict>
                             <w:binData w:name="wordml://06000003.emz" xml:space="preserve">${pl_diagram}</w:binData>
-                            <v:shape id="图片 13" o:spid="_x0000_i1079" type="#_x0000_t75" style="width:700px;height:${pl_diagram_height}px;mso-position-horizontal-relative:page;mso-position-vertical-relative:page">
+                            <v:shape id="图片 13" o:spid="_x0000_i1079" type="#_x0000_t75" style="width:${pl_diagram_width}px;height:${pl_diagram_height}px;mso-position-horizontal-relative:page;mso-position-vertical-relative:page">
                                 <v:imagedata src="wordml://06000003.emz" o:title=""/>
                             </v:shape>
                         </w:pict>
@@ -5279,8 +5280,6 @@ y7fdOgAAAABJRU5ErkJggk==
                     </w:r>
                 </w:p>
 				<#else>
-				
-                
                 <w:tbl>
                     <w:tblPr>
                         <w:tblW w:w="13712" w:type="dxa"/>
@@ -5440,7 +5439,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <wx:font wx:val="宋体"/>
                                         <w:b/>
                                     </w:rPr>
-                                    <w:t>角色</w:t>
+                                    <w:t>角色/岗位</w:t>
                                 </w:r>
                             </w:p>
                         </w:tc>
@@ -5607,7 +5606,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:sz-cs w:val="21"/>
                                         <w:lang w:val="EN-US"/>
                                     </w:rPr>
-                                    <w:t>${table2.shape_activity_description}</w:t>
+                                    <w:t>${table2.shape_name}</w:t>
                                 </w:r>
                             </w:p>
                         </w:tc>
@@ -5681,7 +5680,11 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:sz-cs w:val="21"/>
                                         <w:lang w:val="EN-US"/>
                                     </w:rPr>
+                                    <#if (table2.shape_role == '' )>
+                                        <w:t>${table2.shape_post}</w:t>
+                                        <#else>
                                         <w:t>${table2.shape_role}</w:t>
+                                    </#if>
                                 </w:r>
                             </w:p>
                         </w:tc>
@@ -5861,6 +5864,7 @@ y7fdOgAAAABJRU5ErkJggk==
                         </w:r>
                     </w:p>
 				<#else>
+                    <#list pl_process_kpi_list as proKpis>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                     <w:pPr>
                         <w:spacing w:line="360" w:line-rule="auto"/>
@@ -5941,7 +5945,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:rPr>
                                             <w:rFonts w:hint="fareast"/>
                                         </w:rPr>
-                                    <w:t>${pl_Name_process_performance_indicator}</w:t>
+                                        <w:t>${proKpis.pl_Name_process_performance_indicator}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -5997,7 +6001,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         </w:rPr>
                                     </w:pPr>
                                     <w:r>
-                                    <w:t>${pl_set_the_purpose}</w:t>
+                                        <w:t>${proKpis.pl_set_the_purpose}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6048,7 +6052,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                 </w:tcPr>
                                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                                     <w:r>
-                                    <w:t>${pl_Index_definition}</w:t>
+                                        <w:t>${proKpis.pl_Index_definition}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6099,7 +6103,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                 </w:tcPr>
                                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                                     <w:r>
-                                    <w:t>${pl_computational_formula}</w:t>
+                                        <w:t>${proKpis.pl_computational_formula}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6158,7 +6162,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:rPr>
                                             <w:rFonts w:hint="fareast"/>
                                         </w:rPr>
-                                    <w:t>${pl_data_sources}</w:t>
+                                        <w:t>${proKpis.pl_data_sources}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6217,7 +6221,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:rPr>
                                             <w:rFonts w:hint="fareast"/>
                                         </w:rPr>
-                                    <w:t>${pl_unit_measurement}</w:t>
+                                        <w:t>${proKpis.pl_unit_measurement}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6268,7 +6272,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                 </w:tcPr>
                                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                                     <w:r>
-                                    <w:t>${pl_statistical_period}</w:t>
+                                        <w:t>${proKpis.pl_statistical_period}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -6334,12 +6338,13 @@ y7fdOgAAAABJRU5ErkJggk==
                                 </w:tcPr>
                                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                                     <w:r>
-                                    <w:t>${pl_explain}</w:t>
+                                        <w:t>${proKpis.pl_explain}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
                         </w:tr>
                     </w:tbl>
+                    </#list>
                 </#if>
 			</wx:sub-section>
             <wx:sub-section>
@@ -6832,7 +6837,7 @@ y7fdOgAAAABJRU5ErkJggk==
                     </w:r>
                     <aml:annotation aml:id="9" w:type="Word.Bookmark.End"/>
                 </w:p>
-				<#if (file_table_count ==0 )>
+				<#if (file_table_count == 1 )>
                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                     <w:pPr>
                         <w:rPr>
@@ -6856,6 +6861,7 @@ y7fdOgAAAABJRU5ErkJggk==
 							<w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D">
 							  <w:rPr>
 								<w:rStyle w:val="a4"/>
+                                <w:color w:val="2440b3"/>
 							  </w:rPr>
 							  <w:t>${table4.file_name}</w:t>
 							</w:r>
@@ -6866,23 +6872,24 @@ y7fdOgAAAABJRU5ErkJggk==
                         <#list table1.shape_File_Table as table11>
                           <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
                             <w:pPr>
-                  <w:pStyle w:val="p0"/>
+    <!--                          <w:pStyle w:val="p0"/>-->
-                  <w:rPr>
+    <!--                          <w:rPr>-->
-                    <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>
+    <!--                            <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>-->
-                    <wx:font wx:val="宋体"/>
+    <!--                            <wx:font wx:val="宋体"/>-->
-                    <w:color w:val="000000"/>
+    <!--                            <w:color w:val="2440b3"/>-->
-                    <w:sz w:val="22"/>
+    <!--                            <w:sz w:val="22"/>-->
-                    <w:sz-cs w:val="20"/>
+    <!--                            <w:sz-cs w:val="20"/>-->
-                  </w:rPr>
+<!--                              </w:rPr>-->
                             </w:pPr>
                             <w:hlink w:dest="${table11.shape_file_link}">
                               <w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
                                 <w:rPr>
                                   <w:rStyle w:val="a4"/>
-                      <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>
+                                  <w:color w:val="2440b3"/>
-                      <wx:font wx:val="宋体"/>
+    <!--                              <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>-->
-                      <w:sz w:val="22"/>
+    <!--                              <wx:font wx:val="宋体"/>-->
-                      <w:sz-cs w:val="20"/>
+    <!--                              <w:sz w:val="22"/>-->
+    <!--                              <w:sz-cs w:val="20"/>-->
                                 </w:rPr>
                                 <w:t>${table11.shape_file_name}</w:t>
                               </w:r>

com.actionsoft.apps.coe.pal.publisher/manifest.xml

@@ -19,7 +19,7 @@
 - 内置可配置的发布批准流程
 
 ]]></details>  
-  <installDate>2022-07-27 12:56:55</installDate>  
+  <installDate>2022-07-26 11:31:08</installDate>  
   <installListener/>  
   <pluginListener>com.actionsoft.apps.coe.pal.publisher.Plugins</pluginListener>  
   <startListener>com.actionsoft.apps.coe.pal.publisher.event.AppStartListener</startListener>  
@@ -55,7 +55,7 @@
   </properties>  
   <modelAdministrator/>  
   <icon code="&amp;#xe880;" color="#4E7FF9"/>  
-  <releaseDate>2022-07-27</releaseDate>  
+  <releaseDate>2022-07-26</releaseDate>  
   <deployment> 
     <system id="obj_00093403df6a17ed729913d64f48f930" icon16="../commons/img/home_16.png" icon64="../commons/img/home_64.png" icon96="../commons/img/home_96.png" notifier="" name="%u529E%u516C" target="leftFrame" url="/" deployUrlType="2" source="0" appId="com.actionsoft.apps.coe.pal.publisher"> 
       <directory id="obj_15779670952d4c20aeca29a601ae6caa" icon16="" icon64="" icon96="" notifier="" name="%u53D1%u5E03%u6D41%u7A0B" target="mainFrame" url="/" deployUrlType="2" source="0" orderIndex="6" appId="com.actionsoft.apps.coe.pal.publisher"> 

com.actionsoft.apps.coe.pal.publisher/repository/bo/_c493accc-61ba-4316-bc35-cee75b4db827/c493accc-61ba-4316-bc35-cee75b4db827.xml

@@ -4,7 +4,7 @@
     <createUser>管理员</createUser>
     <createTime>2014-08-14 14:45:28</createTime>
     <updateUser>admin</updateUser>
-    <updateTime>2022-07-26 17:24:54</updateTime>
+    <updateTime>2022-07-26 00:21:16</updateTime>
     <signature>DgQSSyFmOqrf7WQa6WFesZuTOnzFe+zevZg0BYW55MuhMOtUylRD92QW2MZY8fzumIIJ5dbdMmSe4Z/+hj7n45Jsb9smthtrG+oWfQ9si6kl1AjP7JL4o/NB/iTn6hmh</signature>
     <managed>true</managed>
     <title>流程发布申请表</title>
@@ -1146,7 +1146,7 @@
             <columnType>TEXT</columnType>
             <length>2</length>
             <nullable>true</nullable>
-            <defaultValue>N</defaultValue>
+            <defaultValue>Y</defaultValue>
             <columnWidth>100</columnWidth>
             <componentId>AWSUI.ComboBox</componentId>
             <componentSetting>{"placeholder":"","boItemId":"c493accc-61ba-4316-bc35-cee75b4db827","isAdvance":false,"dataType":"sampleText","data":"N:否|Y:是","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
@@ -1201,7 +1201,7 @@
             <defaultValue></defaultValue>
             <columnWidth>100</columnWidth>
             <componentId>AWSUI.TreeDictionary</componentId>
-            <componentSetting>{"leafField":"PARENTDEPARTMENTID","leafValue":"0","leafS":"notEql","filterField":"","filterS":"","filterValue":"","filter":[],"multiselect":false,"checkInherit":true,"separator":",","allPath":false,"allPathSeparator":",","searchShow":"table","fileName":"$[departmentname]","getFields":"departmentname","displayField":"DEPARTMENTNAME","fillBackFields":"SEND_SCOPE_POST","pId":"parentdepartmentid","dId":"id","mapping":{"source":"departmentname","target":"SEND_SCOPE_POST"},"placeholder":"","dialogName":"","mappingRule":"leaf;parent;","iconCls":"","advCls":"","dataType":"localJDBC","data":{"sql":"SELECT ID,PARENTDEPARTMENTID,DEPARTMENTNAME,CONCAT('部门',ID) AS GW from ORGDEPARTMENT UNION select  DISTINCT POSITION_NO AS ID,DEPARTMENTID AS PARENTDEPARTMENTID,POSITION_NAME AS DEPARTMENTNAME, CONCAT('岗位',POSITION_NO) AS GW FROM ORGUSER","rootSql":"SELECT ID,PARENTDEPARTMENTID,DEPARTMENTNAME,CONCAT('部门',ID) AS GW from ORGDEPARTMENT UNION select  DISTINCT POSITION_NO AS ID,DEPARTMENTID AS PARENTDEPARTMENTID,POSITION_NAME AS DEPARTMENTNAME, CONCAT('岗位',POSITION_NO) AS GW FROM ORGUSER"},"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
+            <componentSetting>{"leafField":"PARENTDEPARTMENTID","leafValue":"0","leafS":"notEql","filterField":"","filterS":"","filterValue":"","filter":[],"multiselect":false,"checkInherit":true,"separator":",","allPath":false,"allPathSeparator":",","searchShow":"table","fileName":"$[departmentname]","getFields":"gw","displayField":"departmentname","fillBackFields":"SEND_SCOPE_POST","pId":"PARENTDEPARTMENTID","dId":"ID","mapping":{"source":"gw","target":"SEND_SCOPE_POST"},"placeholder":"","dialogName":"","mappingRule":"leaf;parent;","iconCls":"","advCls":"","dataType":"localJDBC","data":{"sql":"select ID,PARENTDEPARTMENTID,departmentname,CONCAT(\"部门\",ID) as gw from ORGDEPARTMENT UNION select  DISTINCT POSITION_NO as ID,DEPARTMENTID as PARENTDEPARTMENTID,POSITION_NAME as departmentname, CONCAT(\"岗位\",POSITION_NO) as gw from ORGUSER","rootSql":""},"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
             <display>true</display>
             <deleted>false</deleted>
             <modify>true</modify>
@@ -1347,32 +1347,6 @@
             <calcFormula></calcFormula>
             <propsVal>{}</propsVal>
         </boItem>
-        <boItem>
-            <id>31f7c9bb-f150-4be2-9aff-8a04183dc793</id>
-            <name>PROCESS_TITLE</name>
-            <title>流程标题</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"请输入标题","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
     </boItems>
     <boIndexs/>
     <boRelations/>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_1.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:55:33</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_10.xml

@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 11:11:59</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGCODE","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_2.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:43:33</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_3.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:14:09</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_4.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:14:06</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_5.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:14:02</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_6.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:13:48</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_7.xml

@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 23:13:44</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>d50acc9f-3734-4905-982c-c01184c367dd</id>
-            <name>ORGNAME</name>
-            <title>所属单位编码</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_8.xml

@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:29:58</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGNAME","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/bo/_d1a399f2-6e73-4ab2-a0ba-8302d7711dd5/d1a399f2-6e73-4ab2-a0ba-8302d7711dd5_9.xml

@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<boModel>
-    <id>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 15:46:58</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:26:02</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr5+g3t/Lmdnurkq74qH50PMk3EIxOfZvepISBJFRmX3ADi3okXREdws2gF1pTm/uk</signature>
-    <managed>false</managed>
-    <title>权限矩阵表</title>
-    <name>BO_ACT_AUTH_INFO</name>
-    <collection>false</collection>
-    <system>false</system>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <entityType>TABLE</entityType>
-    <viewType></viewType>
-    <viewSql></viewSql>
-    <securityLevel>0</securityLevel>
-    <target>_local</target>
-    <itemProps></itemProps>
-    <boItems>
-        <boItem>
-            <id>0576b096-4416-4893-af77-7c9a723845f4</id>
-            <name>ORGCODE</name>
-            <title>所属单位</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue>@departmentPathName</defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.ComboBox</componentId>
-            <componentSetting>{"placeholder":"","boItemId":"d1a399f2-6e73-4ab2-a0ba-8302d7711dd5","isAdvance":false,"mapping":{"source":"ORGCODE","target":"this"},"display":"ORGNAME","dataType":"localJDBC","data":{"sql":"SELECT ORGNAME,ORGCODE from BO_ACT_ORGINFO"},"valueTrans":"","mode":"common","exportDataValidity":true,"setunival":true,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>1b3c340a-d8d5-43c0-ac08-cad865e3f62c</id>
-            <name>LEVEL_1_PROCESS_NAME</name>
-            <title>一级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_9d1c92cb08374c8c93cd689f6791259e.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a7e054eb-3ff6-4e1c-9845-c29488e1bd58</id>
-            <name>L1_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>45506730-ebed-4cb9-84b1-21925dbf7ccc</id>
-            <name>AUDITOR1</name>
-            <title>第一批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>01a13918-e8bc-4d44-bbc6-7e2d92028012</id>
-            <name>LEVEL_2_PROCESS_NAME</name>
-            <title>二级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_32aed7b6782b4b79bd0431b4d1163a44.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>33ed858f-3563-4ed0-9bae-ebdd906e11a6</id>
-            <name>L2_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"5","readonlyDisplayAll":true,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>742179b8-78b5-4386-bbde-01e1f3a85275</id>
-            <name>AUDITOR2</name>
-            <title>第二批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>361a6f76-565b-4361-beef-5ddfb464d06f</id>
-            <name>LEVEL_3_PROCESS_NAME</name>
-            <title>三级流程名称</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.GridDictionary</componentId>
-            <componentSetting>{"placeholder":"","mode":"dialog","separator":",","dictionryName":"dic_e4ce70ec5a974081b61d85e20728fc1a.xml","sourceAppId":"com.actionsoft.apps.coe.pal.publisher","multiple":false,"xmlShowRule":false,"validate":false,"clearData":false,"boUrlFormData":{"hrefSelVal":"nothing"}}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>baa3ffa3-eae8-4e9d-b32e-01f27daf4b72</id>
-            <name>L3_SP</name>
-            <title>是否审批</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.RadioGroups</componentId>
-            <componentSetting>{"num":"2","readonlyDisplayAll":false,"data":"1:是|0:否","dataType":"sampleText","exportDataValidity":true}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e12c5ec7-27df-461c-a6f9-b970361897d0</id>
-            <name>AUDITOR3</name>
-            <title>第三批准人</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Address</componentId>
-            <componentSetting>{"placeholder":"","addressType":"user","isLiveSearch":true,"isAdvMode":false,"addressSetting":{"isMapFormat":false,"delimiter":" ","choiceType":"multiple"},"deptSourceField":"","deptTargetField":""}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>76b5db41-8828-4944-880d-ce9e99efa294</id>
-            <name>ADAPT_REGION_NAME</name>
-            <title>区域</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>884d9df0-45f7-4af8-811c-250870770942</id>
-            <name>ADAPT_REGION_CODE</name>
-            <title>区域编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>8d26b6ae-9714-45da-910f-e2ffcdfacc9e</id>
-            <name>APPLICABLE_PRODUCT</name>
-            <title>产品</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>b1abbd94-a72d-4588-a94b-2c6b64e30cfe</id>
-            <name>APPLICABLE_PRODUCT_CODE</name>
-            <title>产品编号</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>7d9ddc46-eb2e-4f3b-869f-fc447cfd2ec5</id>
-            <name>MAJORKEY</name>
-            <title>整合主键</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0","placeholder":"","dataType":"localJDBC","data":{"sql":""},"isClearAllText":true,"barCode":false,"boUrlFormData":{"hrefSelVal":"nothing"},"extendType":"text","scanCodeAutoSubmit":false}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode>readonly</componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>a36e250f-9d4e-41e7-890e-3f29311b9f86</id>
-            <name>LEVEL_1_PROCESS_ID</name>
-            <title>一级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>e8e29640-ffc0-40cf-9cd9-c0a8a2657a10</id>
-            <name>LEVEL_2_PROCESS_ID</name>
-            <title>二级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-        <boItem>
-            <id>30b38b37-a2a6-470a-85f0-66d820e601f3</id>
-            <name>LEVEL_3_PROCESS_ID</name>
-            <title>三级流程ID</title>
-            <columnType>TEXT</columnType>
-            <length>128</length>
-            <nullable>true</nullable>
-            <defaultValue></defaultValue>
-            <columnWidth>100</columnWidth>
-            <componentId>AWSUI.Text</componentId>
-            <componentSetting>{"search":"0"}</componentSetting>
-            <display>true</display>
-            <deleted>false</deleted>
-            <modify>true</modify>
-            <componentExtendCode></componentExtendCode>
-            <persistenceType>ENTITY</persistenceType>
-            <validateType></validateType>
-            <validateRule></validateRule>
-            <validateTip></validateTip>
-            <validateErr>0</validateErr>
-            <tooltip></tooltip>
-            <copy>false</copy>
-            <displayRule></displayRule>
-            <calcFormula></calcFormula>
-            <propsVal>{}</propsVal>
-        </boItem>
-    </boItems>
-    <boIndexs>
-        <boIndex>
-            <id>e924ffe7-3841-4cec-8b5e-5d72a7ce9104</id>
-            <name>AWS_IN_73184B20FA3E</name>
-            <type>INDEX</type>
-            <boItems>BINDID</boItems>
-        </boIndex>
-    </boIndexs>
-    <boRelations/>
-    <hashFields></hashFields>
-</boModel>

com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_6f55ec70aefb45cfafd3f619c4e138ca/obj_6f55ec70aefb45cfafd3f619c4e138ca.xml

@@ -4,7 +4,7 @@
     <createUser>admin</createUser>
     <createTime>2022-07-12 15:36:25</createTime>
     <updateUser>admin</updateUser>
-    <updateTime>2022-07-26 12:00:11</updateTime>
+    <updateTime>2022-07-25 22:09:40</updateTime>
     <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGraZM67ZCW9a9S2Kq3lk9E0VDM3aHkRJHr7BQ0SuHrY0BaEx0DyGULBcxPOYGkP28Q</signature>
     <managed>false</managed>
     <version>1.0</version>
@@ -32,8 +32,6 @@
         </toolbar>
         <searcher id="obj_03a69abb6aa0426d82c71437a848a1a3" isshow="true" layoutType="tile" tdGroup="4" tileLayout="y" textCls="" dwLeftCls="" dwRightCls="" extendcode="" event="" xconditionEvent="" tileOpen="false">
             <likecondition id="obj_178ad7e34bc74b77a94eb10a8fec4948" field="PROCESSMANAGER" extend1="" label="流程经理" comparetype="=" uiname="TEXT" relationship="" uidefault="" uicomponent="文本" uiref="" required="false" security="" orderindex="0" event=""/>
-            <likecondition id="obj_7610eb1d4b8d446cbabf2a9700534e57" field="ORGDEPART" extend1="" label="部门" comparetype="=" uiname="TEXT" relationship="" uidefault="" uicomponent="文本" uiref="" required="false" security="" orderindex="1" event=""/>
-            <likecondition id="obj_3a64266eb34d44ab9db609c16b99db9e" field="ORGNAME" extend1="" label="单位" comparetype="=" uiname="TEXT" relationship="" uidefault="" uicomponent="文本" uiref="" required="false" security="" orderindex="2" event=""/>
         </searcher>
         <navTree id="obj_d0cee1246c1648fb90fc6a5c3c81a7b3" isshow="false" type="" rootcls="" leafcls="" ismultiple="false" isexpanded="true" orderindex="" event=""/>
         <layout id="obj_df987bfac9d744e0a3ca345799ff7c0d" label="" classname="com.actionsoft.bpms.dw.exec.layout.LayoutA" event=""/>

com.actionsoft.apps.coe.pal.publisher/repository/dw/_obj_a53d2f8a27f249859f4c04619c9cbb9d/obj_a53d2f8a27f249859f4c04619c9cbb9d.xml

@@ -4,7 +4,7 @@
     <createUser>admin</createUser>
     <createTime>2022-07-12 14:52:40</createTime>
     <updateUser>admin</updateUser>
-    <updateTime>2022-07-27 13:14:13</updateTime>
+    <updateTime>2022-07-25 23:43:13</updateTime>
     <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr32Sz9TVEi14g2FdHXJZJ4fyk0zNA1G6Vn4ILeom3ib+JfveDGEqpdK2EE05v4Utv</signature>
     <managed>false</managed>
     <version>1.0</version>
@@ -37,28 +37,28 @@
             <dataBaseConn></dataBaseConn>
             <freezeField></freezeField>
             <column id="4a8833a0-6666-45ec-ab97-59a13e1ed35f" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="SSFB" label="所属分部" orderindex="0" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_c9c7bb1385074d0f963dbbd1348abf60" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_1_PROCESS_ID" label="L1流程编码" orderindex="1" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_c9c7bb1385074d0f963dbbd1348abf60" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_1_PROCESS_ID" label="L1流程编码" orderindex="1" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_3fc74ef4d6c448f0b14b9af7cdd998ac" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="99" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_1_PROCESS_NAME" label="L1流程名称" orderindex="2" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_3fc74ef4d6c448f0b14b9af7cdd998ac" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_1_PROCESS_NAME" label="L1流程名称" orderindex="2" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_40ad2931518240fd9ceef7c7cf1a913e" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR1" label="L1流程责任人" orderindex="3" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_40ad2931518240fd9ceef7c7cf1a913e" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR1" label="L1流程责任人" orderindex="3" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="8f38a5ed-1e13-4635-b850-3ea1fc84b029" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_1" label="L1流程责任人编码" orderindex="4" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="8f38a5ed-1e13-4635-b850-3ea1fc84b029" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_1" label="L1流程责任人编码" orderindex="4" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_e9948fb087fd477184078a34920c5509" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L1_SP" label="L1是否审批" orderindex="5" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_e9948fb087fd477184078a34920c5509" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L1_SP" label="L1是否审批" orderindex="5" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_3ad95d82d61a4203b8aad2a1e36af9e2" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="147" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_2_PROCESS_ID" label="L2流程编码" orderindex="6" colbehaviortarget="" ishidden="true" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_3ad95d82d61a4203b8aad2a1e36af9e2" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="147" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_2_PROCESS_ID" label="L2流程编码" orderindex="6" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_96680986bbd24f33bd8d5f4b7b8d1263" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_2_PROCESS_NAME" label="L2流程名称" orderindex="7" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_c2a1e0dc45244e7a9fccd9d1c1e3f771" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR2" label="L2流程责任人" orderindex="8" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_c2a1e0dc45244e7a9fccd9d1c1e3f771" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR2" label="L2流程责任人" orderindex="8" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="f7c8709f-3653-4910-af59-13b04e0832f0" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="155" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_2" label="L2流程责任人编码" orderindex="9" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="f7c8709f-3653-4910-af59-13b04e0832f0" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="155" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_2" label="L2流程责任人编码" orderindex="9" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_ef469f9e14e54395a61c8b3c88d3e773" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L2_SP" label="L2是否审批" orderindex="10" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_ef469f9e14e54395a61c8b3c88d3e773" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L2_SP" label="L2是否审批" orderindex="10" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_b9d334da4b22435aac1b7f1ddb87d2b9" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_3_PROCESS_ID" label="L3流程编码" orderindex="11" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_b9d334da4b22435aac1b7f1ddb87d2b9" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_3_PROCESS_ID" label="L3流程编码" orderindex="11" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_0095da77388141aca97b49b203b35457" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="169" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="LEVEL_3_PROCESS_NAME" label="L3流程名称" orderindex="12" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_2c2426ce08804770b172a1089a291894" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR3" label="L3流程责任人" orderindex="13" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_2c2426ce08804770b172a1089a291894" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR3" label="L3流程责任人" orderindex="13" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Address" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="ec52c08f-5820-4d06-873f-8c366ab327c9" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_3" label="L3流程责任人编码" orderindex="14" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="ec52c08f-5820-4d06-873f-8c366ab327c9" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="AUDITOR_NO_3" label="L3流程责任人编码" orderindex="14" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_60ba2e6ecac64355b63b3856789f1a4f" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L3_SP" label="L3是否审批" orderindex="15" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_60ba2e6ecac64355b63b3856789f1a4f" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="L3_SP" label="L3是否审批" orderindex="15" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.RadioGroups" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="3ca1d333-58a3-4b1d-a820-ca8dad752ab5" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="ORGCODE" label="单位编码" orderindex="16" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="b34b5fdb-5908-4b92-9c84-9ebf3b999c7d" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="ORGNAME" label="单位" orderindex="17" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="b34b5fdb-5908-4b92-9c84-9ebf3b999c7d" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="150" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="1" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="ORGNAME" label="单位" orderindex="17" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_189a5d89283844e492b12acd915ed1fb" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="ADAPT_REGION_NAME" label="区域" orderindex="18" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_8145e271d759415bae7ccc9fcf1b0a8e" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="ADAPT_REGION_CODE" label="区域编号" orderindex="19" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_b76448a28c714623bae0c3286e86bb31" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="APPLICABLE_PRODUCT" label="产品" orderindex="20" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.GridDictionary" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_36ba820cc9e94f30a6caccca3724c111" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="APPLICABLE_PRODUCT_CODE" label="产品编号" orderindex="21" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
-            <column id="obj_a34c260220d548a9831f13e3ba729817" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="{&quot;type&quot;:&quot;tx&quot;,&quot;required&quot;:false,&quot;length&quot;:&quot;128&quot;,&quot;cmconfig&quot;:{&quot;func&quot;:&quot;&quot;}}" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MAJORKEY" label="整合主键" orderindex="22" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
+            <column id="obj_a34c260220d548a9831f13e3ba729817" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="100px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="128" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="MAJORKEY" label="整合主键" orderindex="22" colbehaviortarget="" ishidden="false" export="true" backHide="false" isusedvalue="false" tableheadsort="true" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="0" boType="AWSUI.Text" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_4a9cb5956d2a414e89dea978b9ad9a98" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="120px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="36" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="_ID" label="业务表ID" orderindex="23" colbehaviortarget="" ishidden="true" export="false" backHide="true" isusedvalue="true" tableheadsort="false" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="1" boType="" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_539e7c5632064a5997b6e4bc232ca806" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="120px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="36" required="0" align="left" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="_BINDID" label="流程实例ID" orderindex="24" colbehaviortarget="" ishidden="true" export="false" backHide="true" isusedvalue="true" tableheadsort="false" colrefbehaviorid="" columnAction="" datatype="TEXT" handleType="1" boType="" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>
             <column id="obj_aa1da5b5fe81415ba4ee175390726d04" sort="" isfilter="false" bgcolor="" fontcolor="" fontsize="12px" width="135px" colALias="" colTableAlias="" colTable="BO_ACT_AUTH_INFO" length="19" required="0" align="center" showrule="" upshowrule="" upDataClassName="" extend1="" extend2="" security="" securityLevel="0" event="" field="_CREATEDATE" label="创建日期" orderindex="25" colbehaviortarget="" ishidden="true" export="false" backHide="true" isusedvalue="true" tableheadsort="false" colrefbehaviorid="" columnAction="" datatype="DATE" handleType="1" boType="" count="false" countType="" colorFullNote="false" colorFullNoteMap=""/>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_1.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:44:49</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_IDBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_IDBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_IDBO_ACT_AUTH_INFO.ORGCODEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_ID","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_ID","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_ID","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_2.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:44:46</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_IDBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_IDBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_IDBO_ACT_AUTH_INFO.ORGCODEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_ID","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_ID","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_ID","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_3.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:30:09</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAMEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODEBO_ACT_AUTH_INFO.ORGCODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAME","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_4.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:30:01</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAMEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODEBO_ACT_AUTH_INFO.ORGCODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAME","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_5.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:29:58</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAMEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODEBO_ACT_AUTH_INFO.ORGCODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAME","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_6.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:29:34</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAMEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODEBO_ACT_AUTH_INFO.ORGCODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAME","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>

com.actionsoft.apps.coe.pal.publisher/repository/form/_4f09f813-8435-4f1f-a908-c9cacc30a338/4f09f813-8435-4f1f-a908-c9cacc30a338_7.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<formModel>
-    <id>4f09f813-8435-4f1f-a908-c9cacc30a338</id>
-    <createUser>admin</createUser>
-    <createTime>2022-07-08 16:06:25</createTime>
-    <updateUser>admin</updateUser>
-    <updateTime>2022-07-12 15:27:33</updateTime>
-    <signature>tGOmxiTgjT/77UoYpSlq8Vc+hHPRoJWHdZexXc7zEpYuMNdhvSICeJnlc/RzRHGr/165fv9MXNIkNrZC1jOGHLkx8aSBlKuxcb6xMkvQFvyyV9WIaSV7U06mhMnPVOQW</signature>
-    <managed>false</managed>
-    <title>权限矩阵</title>
-    <deleted>false</deleted>
-    <categoryName>资产库周期管理</categoryName>
-    <administrator>admin</administrator>
-    <defaultLanguage></defaultLanguage>
-    <url></url>
-    <urlHeight></urlHeight>
-    <qrCodeLink></qrCodeLink>
-    <formItems>
-        <formItem>
-            <id>be6e7865-02b8-4ce3-bb2e-39aa085e9bd2</id>
-            <title>权限矩阵</title>
-            <templateFile>{"tablet":"资产库周期管理-权限矩阵.htm","pc":"资产库周期管理-权限矩阵.htm","mobile":"资产库周期管理-权限矩阵_m.htm"}</templateFile>
-            <grid>false</grid>
-            <gridSetting></gridSetting>
-            <orderBy></orderBy>
-            <pageLimit>0</pageLimit>
-            <boModelId>d1a399f2-6e73-4ab2-a0ba-8302d7711dd5</boModelId>
-            <dictionaryFileName></dictionaryFileName>
-            <hiddenHead>false</hiddenHead>
-            <theme>{"pc":"_bpm.platform"}</theme>
-            <itemDisplays/>
-            <scheme>{"pc":"scheme_aws.css"}</scheme>
-            <calcFormula></calcFormula>
-            <conditionControl></conditionControl>
-            <validate></validate>
-            <icon></icon>
-            <gridControl></gridControl>
-            <summaryControl></summaryControl>
-            <ruleControl>{"displayRule":[],"requiredRule":[],"modifyRule":[],"calcRule":[{"targetField":"BO_ACT_AUTH_INFO.MAJORKEY","formula":"BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAMEBO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAMEBO_ACT_AUTH_INFO.ADAPT_REGION_CODEBO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODEBO_ACT_AUTH_INFO.ORGCODE","changeField":["BO_ACT_AUTH_INFO.APPLICABLE_PRODUCT_CODE","BO_ACT_AUTH_INFO.LEVEL_1_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_2_PROCESS_NAME","BO_ACT_AUTH_INFO.LEVEL_3_PROCESS_NAME","BO_ACT_AUTH_INFO.ADAPT_REGION_CODE","BO_ACT_AUTH_INFO.ORGCODE"],"calctime":["changecalc"]}]}</ruleControl>
-            <hiddenFields>LEVEL_1_PROCESS_ID,LEVEL_2_PROCESS_ID,LEVEL_3_PROCESS_ID</hiddenFields>
-            <hiddenAddBtn>false</hiddenAddBtn>
-            <verticalLayout>false</verticalLayout>
-        </formItem>
-    </formItems>
-</formModel>