diff --git a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml index 5409ae65..6cd6c790 100644 --- a/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml +++ b/com.actionsoft.apps.coe.method.process.epc/method/process.epc/diagram.attribute.custom.xml @@ -33,5 +33,6 @@ - + + diff --git a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml index 6d0e5a37..579d8898 100644 --- a/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml +++ b/com.actionsoft.apps.coe.pal/method/data.form/diagram.attribute.custom.xml @@ -1,17 +1,18 @@ - + - - - - + + + + - - - - + + + + - + + diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 2adaed31..900f8d22 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -1354,7 +1354,7 @@ public class PALRepositoryQueryAPIManager { return result; } - + /** 父节点下的所有子节点 */ private static void recurPermChild(List repidList, List newList, String newParentId) { if(repidList!=null) { @@ -1454,7 +1454,7 @@ public class PALRepositoryQueryAPIManager { return result; } - + /** * 获取有权限以及Methods限制的完整流程树 * diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).doc b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).doc index 67bec1ce..118c1f02 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).doc and b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).doc differ diff --git a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml index cbaa17e0..98520431 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml +++ b/com.awspaas.user.apps.coe.pal.output.bd/表单-手册(修订版).xml @@ -3119,7 +3119,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_form_number} + ${pl_Form_name} @@ -3580,7 +3580,7 @@ y7fdOgAAAABJRU5ErkJggk== - ${pl_application} + ${pl_form_Scope_application}