From 212d897e8118b1bfefb7b83846c1dcfdda4eea63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=9F=E6=9E=97=E5=B8=86?= Date: Sun, 10 Jul 2022 10:48:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AE=8C=E6=88=90ARIS=E6=B5=81=E7=A8=8B=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process.epc/diagram.attribute.custom.xml | 3 ++- .../data.form/diagram.attribute.custom.xml | 21 +++++++++--------- .../PALRepositoryQueryAPIManager.java | 4 ++-- .../表单-手册(修订版).doc | Bin 239616 -> 239616 bytes .../表单-手册(修订版).xml | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) 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 67bec1ce001408e36ac64ac44b3329efe8d0ad29..118c1f02cbcfb805dc35e082433abb72a7f8470c 100644 GIT binary patch delta 6000 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 OdO3Z-s@5OUUj08}8Z31H delta 5797 zcmb8z3tUuH9tZGq&K+LE`#m6|AS~g8I3lsgYC^bWR%Cw6BsG;#N91EkuAfQ;%xYb? zE#V*sALWRw_F6N>kC?G0)!O6Z52OF{tyo zl@9Vpd7t==U&#c<(qz0=bl-t&#sscAh@8^@lBeOkb+_SMTsR?*vFX_F!u1nnttna_ z)(S*dwj9)Q)1%Q%91fOdV)HL@e;Z?;GdagJI*Q`(O{JM~d|K{UI)l| z!_JrmSKL!wjuItjh9@6FqLMxHv)+p@p5vZc#*F$4=z%8gVO)o)8%|CH6ob7n7y~s) zQ%0%Od)_(>oRS;YZ$nP|Xh&n^cEoXKKE*NGTTka1>C1Fa=>;5*!2}v3G;$1ll7F$8 z=93a;veuOD_rk4=ok1y8+5#=2WP%*@KO)xUx!M96#f0%}Jj+6mo^7^XwzF|;7V2`? zY;XNoR>JND{hyjr!I#R;qCnS|W{Yq|h4yi4GF!(2SQ=Zy9%mJ70jp$-*&_A?dyK7M z>l9zgqgBLG9w$q~U#Ytzqb_2`oQ;^UO>hzV!3~$;Dh$9i7=+{?JZ>=PO?`uXC;Rkr zTXWqr-pb{(JtM|e?ueZy>msJ|EIGe0MSCoR%LfX7D4Qea@=6alvAu`8JwCR&&Mb2KlIORe#; zGbuV5#9%}S)7*zwV(6sOP80wC8 z+u#U%2>sxO%WxG2;F^kD%cCcS1!J_34jEvBEU-iGsrTPTdVlApr+Ulh6;GbGv-hc9 zpPMERr>6PizRjK9B^O4<%0*Ty9@3r!tL(On)?@b>OE`X>MLkvfmG{Ye{3~g`}&cHe7g60A|%0gf9gJS^5pRUj*ep=?%UU4q%G^WEZeevJ?+X91+8}N z!9X6amHXj!%kxu-ed9+HdBBf<$rz3!4jjjxJXAPM3t$1Nu!1jZEvVq_ymdwwKgF%0 zz%w9Y5HtV^p5m;MS<@2Kj@NmjYsQ`XdCI?weG<+sFwS@7PdmnWlB_L=uYMJkufv4{o>&S789I!64Av{ovr`?(V_QKGWZw4mQ!hrk7u) zy{(%u1WGb5?PoIMo~S@$N@V^$zZsQ8q22*EM@A8STj&~j?*%^Qe~m()A~~-()OCOH zgkUks>Uy^1=O)S{ADQbPZM<@?K{PcZ^q^GaY(7ppO;N6+WobODrs}u)OS$Jv>0Vqp z!l*KG{W8zS=i(*JFAiVqIa5|%sl2Jm<-X$n{Y`bP?h}0JTGhNzfJSBQ{=fX1#TT@=$g;(0MG#E%w2)wPQf070iHGyaGYAWMVM8DY4_t%MdwYxzitA+JqggRd@{P=UKykZ<^d`J~;5efQ)i78C&suvbI zDM-E6C?eJAMqE8siEvdw{r;>`M5%|BFl*?N8i@|q1K)d zzCDh`**DIiH8-8}wD9-ovE<$oq#JGeUSYJ_6vPBXt{jAQ)N~wD>SRxyg;*XE0t4~W0{tx^2;=f3R$d~RoG%JP^~S~ z!jx&TmJ~pX_-u2L`s*_7L0+UDDA#U9wys<&Le^f6Ugr5Uxx%Ns-lr^m%6ojuhkVMP z`jr1b<+;ka3;~^~&~}6~HWz{XoO|-Attky$@q;V0uhL^*!GR%sXV|cIMN$8IhfV#h zUR$8AfoX9_t0Y=t*zqn!Z=UqxLaz+;i%dT<^v#9S7!K)g0FlV)_E>PBTDxBkM)p2VcS0 z@MriIF2W_)h-f##75E*cgx4hG4?(Hd2IS;f zsDo`@-yk1=YY>h86JQ+VLNUyQd9VY8tzp}>OjB&N zUhR3VdQqknqwe3SrONs5B&%&ZwdC-4%YAHf!UHTXd=9IcQ=(4n)Dq;fZPYw)l w`W;{g7++s$*N+cxXpS!k{F(E1S>q1o)764K+N-AGj#tepc&~Ov7NmXkcM&m8PXGV_ 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}