From f1e1bc366cd8111b2d19cd39441902395ace3388 Mon Sep 17 00:00:00 2001 From: qinoy Date: Thu, 3 Aug 2023 17:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=85=A2=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...om.actionsoft.apps.coe.pal.cooperation.jar | Bin 68133 -> 67884 bytes .../CooperationQueryAPIManager.java | 17 +++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar b/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar index 12a703c72d1dc370483accbe2ece5adaaeda8aa3..366ba3760c99c66a1b32b7aaec11c1eb7b52b7b8 100644 GIT binary patch delta 4820 zcmZWtby$-P_hxhnl1dt&(jwi;Xz4DI5<$dChav-qARS|j9ypO!>2766jC7>H=ob(+ zkgiX*_xgR`b^V@y&VBB4pSYgqkLNlkKZU$BnVi8$myDd2goK)en~dzjDOHoN+@Lrmy>KcwsOKmNV1N-yV4&xo^3Z`jy2>KvD>Q_z&~IEi zghVXALFHraP-=o6%MT-zLk0;@5M^&fwFnWEXf!oB=_680=pdt9vKR$)P3K%nQ>8pxd%PQhxM_OA5yIevauV7Wm1g9wY3Q?{Ak9xmigM6h2$>C@YJpc z8lV{cPP9=w3LzVvbb-cw^0zI{3aoG}d1v6>NW{GB_CY=4U93wG_ZW`un)`RO>dA1V zC9ZgUw}iAQ!k%uID=)>){h&d~;Jr)hPrM?>$xNgyZWef&5Wl~607(Ro;_n0@M)9rl z@v?qd!(KKhj_h2Pe-`JPyUU=F-@Dh5O2fXxE{R{DhBFij916UHMMjz$3T(ZN>fnNB z+k5L$b~BQ`La=~z1IZ<2U6e{Tse;{gB%O3d*^mZj|Bb6JlHRkuq{)m5hYh-kwU@|+ zH<{;Y3)E-KeYP4^!&Rvtivqn~3pn}3((ha2`=8pU$)D}H4btzY;S*zdKHZULeR$bs z3NnP{luV=7;EP&)P|+3pomslQ&>YMn*?AJ*Raz$ql@{fAweX(p+KV;!DF@9yRpAi% zJcq%DH5$x1lFUzjJr`!zkDIhEt?8wIS>ZIKF2E6&0E)N8d~%c08Mhc}8JTv$g!gwl z=m$vfM$+OjSW9mre;56pfAbt+ou_{Te*u?bwaNvw91jZe`S1UZ! zk(*vcY28?nD*i@GtXW0g%yrg4xLbGme2H)BrjzzJ?$lCh3M7-k?&$5ldif!YVYi`| zoa=USs=P>FQyuIo%?`s3`ZsvA0C{41hZG8nT8=-(3SNP;uY4=fO z?|CXH>M_NqEa|ZI8GjYShdi@l!Z{ALRl7c4w;RxGXs#^BjKm8$Qq~BSp z9?ENn|Hh>zAo|l=r)6ohX3^>1#hHQVEa17JD$5m4QUkyB`Y!WLjJe+SPCekp-L*Do zPBFWGiMD*3jDqn$DLml0>6&VDJ=JrYIc&*X`O(#d$<6rqZxGC6;)9jxR*@$4 zU{{B$Ob~X5aPgImNKD~$?mORdP54z`L32;%AA$Bd+SF1uPmFGfKJ}0)j4tN5e#r(X zP5F~~zc@L{TH7uCZ5oG})-I(eaw+(_jpLw;-q1sL@xr9>J7zB6L7|4Xr(W?YsCMdI zuBwdBi)OkI{=B`7cH{jFeyykaF={Mgi??(obW^*NZ#6xkxjVEf1j#5&C!vHpNO3Ri zZN=L*LGQAIepF$;x-htnIvEL<-SfPw;y7s2Fxdty)bwd<`*N*qa;Y8>gCC_!tR-$i$%bbOLL>lHo&*l+6YdQ5`(SkecXe z8Ay$3W&0e8MN?o%IYZl~GueUi?16O8(__-%u9m4ACN{0o4&Dp0t2PbsbXH=Qo+Ibk zPm{Nogt^w9%L~~Ywms;qXvmkTbbMC!@h-Hntk)f0au_iQjyR%ZnBV=wz}waF8zV-u zcWE>?NzmXQXNVIP9oSmkDB8gYc{`dLSa!ol9K`T4sxr7$LNLWGPRrR_5zEJqya%C$ z;q%l@Mc5NIC9Er~v>f>y+Rc$rm9J= zxFlG3vc}eY$}K@B?&5s65U^Jw%5jXz+YYo}x?(=HN^h5DYW8_L0av;8D@@Ue-mbox zr}R-d>Z{qQ62)fSF(uZ>JzFHdfF z&^%+dX#h)@jC3XFr%u;X0h7*nC6%1AeV};R4ZMXxFD?UV3}O#f8}^TyL<4AiU+xKM z0aY?sh5{>s%x;*Oer%PbYx!i@Qs~9~StWs2`Lm)SY58+B9t-B}Ik@gKfd8d#<)wn| z7fUOdQMhemt&#HvgV{Ms;;Ut^d4ksW-YlKy2cLNTaslTRCM3M8uXwc`g*|iR z<;luw7kfz?*{F5YbvWVRZ@AoICbzku2Et9B^c$(Sm9`<~ z-h~ZP=7>+Jjw+P*$PWuTZy_!R$Hi?I=FA2cysO>5{3t;J3yejmgpko;+i%rH33jpr zxoJXH_@bD!+C8Mn0=woy$h{R)cY~rE!S4}`o|U5igoM_A7x6r13aq*Iwsy!=I-;pL z@IBl;ZpNK=I%aWzS%0(YBn1gNoMmb#16Sd{j_`u zaIX^_w&9Pp`1Eut1#HkJ8&U6}9|nHhcG==#i@4D$V#_{vk?wTq>>ax2Fbo*kFpep& zQ<(F4WWp-&infwWqi6hh&NWXr5Ik?fq!{YN@hZ!)jYUB2eRNsv(ny%39UvjR2MOF| zVvrncQ?+}?{3uMKv`eFod8v-p+^xgKO_R|^Zmz8E(sP_~>338)1L6VKRz2_WV0`3P zfYxBtopPqTPAu_At~*~j?v%fqUd;n~ZX7A->;q~y>+t!G#)L-vg9Ur=8?l0Ks1x+La zPeegWW{UBzaiFG1pN@V`&_Xrklz8Y=x@EWGn4qYJ$JXhAVt%^mh>mC8Os|s3=y962 z;M%EPebRvcOc>+W^PF!iXfWv7q6Vz5ysT03#jl(yzkrVQjfTj8)62cH6btl<69w2# z&NG$Wb3RT(9O4Kp>q+awdcFw*zg_2l1P(vuf12&Ybm^LM9BBx1Ha3yfaFB1u-Q?1i zj`9{ME&40GihI5|@x7Lp8-lm!eUVLGcPcA|W&)pI}=6U&x zv)*^#P$ma?2C!fgKFW0@Nhv9Qk%sL){DVqAQ-HAhwXHSdQ8K+CwrYfEx9KPkZHZJ< z#~!sseqsm4s{rYI-!>z87MgnHPhxN#$)sRkH4|1}WEfZ9l^%EJ9t7L=BOW~8O2r{* z?q6r`c&bqO($D61#CIVch2q~&Jb#xOth~MRGqes^=Lilmd%!U7{Zp#x%)A3D-n~xi zWLbvp>tFEi+7N!HEZf=AljIknFX6$SuFGQ(<7qR}_>sPQ=ZlV^UgMR_toExI-tWN2 z{?*`YlSI@T2@Tls)W*}XQgTcI#b+J5swvW)fzM&CD^%OzH#ax-09nWcM~JCfNGj); zL$mcI%sO~0ks`Yyw-@WdivHwbQ0pmEkX`AL?DHyoB&~l!DC@;U*6)sg`jyY1cp1i5U4J85=^@92niZB~Ux`(whB+s-7i^)FrJH!i*1vf1hqrTYnAH+T9dmKRF)gk?MwgJ?>^=PYO zi%qH&yx?8x?N@HMh21_QRYr<21y#MpNEB)Z!5eFY=WyCX`JoWOdMDhkS?Qj(9e|ht z)j>AQWVL3LH#Hgf1qQrp0S|37TnG~L{aLw{9x#+?)wOHy8S%8OOkv+{xDuOk&Ub50 z_Y`R`3!1C#tsgaAHhF2^bES|EHbMF5>Cp{NMN%M2?*T;7&y06n{Hh9E0G0 zC;)^p;0Ba{r-T}{lz?Z%7(W%jmO#Cw`kP3QP#Dsk(v6G| z>5?4r>h`|h_kPFs{Bxc6d7W1r_kBG7oFys5MXAJ;IvPa8*9Zte1O%}GTSm#0+{Cyj z0l`OW5t_eeg8%xM;msth$>?i%LATWZ6A1hf2*Kq5cm-V1SDMDo&-3=*N%RCD5Qrcq zc^$q9GJ?xusZhs&S|Z{NgFg6cLiN z4FEMfUuqoJ92I&;nBsp{!DqQpUf>M8Yg}oROX|Q8@RrVF8u%;`02_> zf>Tv`%M#-26n#~RqyF3>D#o|b7Kh-WcckG>zO<;ciG+WP!i1&ameW+Y9$wQX#5mA9 z|LWhfO&2wAO!49Z0N*uk`N3ZX-a9XYqF7-C;1?JAX$mtVw=!5syBz4V+wNcHi@HZx z&}B}+!&T1<7~Vl%HpsSzBd!Q5ma?vmn>H)FFi3c!6(L{Y8nXqvyiQ|U)a;741O`} z7iz)(q{|{Vbbnx^+lo}TL5oB-Vd#TSafK|ynna>x{@%X8`1>gTLNZy+RLSt%vXtX7 zS_%>p zQ#5v3y84A96g62D&*IsU{6nlUbVgGCs>*3F2S;vdvd)`xvFcE8f^mRqNzZ$hn z_QzQzB^o0eXC)>uO^qcm)a}Tm!hUm?LuiOOk-yK2e`iidHpH(cw`-;*v-!|Sf|iPh zyW;Y?Sg#ppEDtD0JtrU&-QV+;W&4AhW*Z^qjeSO|w*)y*wvQ53ITOzx&}N!2R_Y4N zakUXcI*S8y!E7Myf@9e|>DkDtO4q1%Z0%BPriyix2-^#*8v`Bm)4pM` z_dZv~%H&7&d3`=OMMxUu-x(e&R5_6Aj~Z)53%Qdm)i}&d@T-Q$RYMNE82qGnB4=o&aJB}4hHf}tPjQ+nu#LyZbZz`~=uG(eg06sWiD>^e9(L8w2< zbmj-`FPEAl>W-tfJ}=`Zo;M~LP%Qy%p}F6h?@fT^if4xiP^AwH+N__~6*9(RD2}#jY`hb-Y?)Rc zd$_*kcjG&=VcWy1uEh^&Jg04D5n@yygd|z8^c1@PsN{_tap6@3fh?FrH(yMPTcpy( z_y&QhUd%DXeEID!O8na=t%4Jl)|6?DRyR~1n0zE*`^#-yd@(N9>+IWPsy`YN;J|PO zyO#a+J9WIp=j?Z?D;}C_UU#WJ<@Gj&d$s{I6-@Kv2Xb!;LX8<^LFXsCwrag?$3`0& z)^@gQ0v3bN)lbY{k9?AbMP;#K4ppjWHn~Rk?|DQ+U}iyOCLT8uqm<%c-lW$1?Fr*f zu}TvodI=vXKJqC#TTIugD-#wE`9ylWWuUkK&ON*%cFAgRzZy6;q&^Ud0o)i(P%gaw zu^1TXfi!fZmIPO2L+V~+Q<&ZFk0)ILmKHG{b@G;ZQ>wo0ed}NKhE9T{Au5=OD$!+z zmM!Z{_9dT1zs65wMqe5)%s05(!ZKg?lM<`bO#p>iZn9Mrnl-R*5gs~Z^`y=hWajWi z)g4$p!bb#4xCwM;^kU5kxDbTS_tv_9H}Y1Jb6?6)zcuNxK&<8B_vv|{~EK$O}@yno=Ymb27Lj6+l9*-vQRIP6Ea9xQ9oRu>&fM%vlV`P+?rg07BaLdxH z+KYofQ>p-sb{UE|l|s2(%6EJ69h*%InwR|i^wUtdWHB^eqn>UwLqZVs_WHD@<}J4C zQl@BLhf4s+vGVu4K2FF&gq;?&+m#W?8sVz?T5n_#DRRyi38ZEqX#GFnX-9u@9))1r94zo zPE1_M*WS8fr;Sdv5brcj1de(YK(Eb6|F9;xkI6H?kSGx2g1Htc@4tL26Y_m?vubfK z>)@x@vjJwLrkVu(7yCQ=H)EyP2F`ROnyU>FE0lTtMb(>nLG*fA7E{gvM`jTZ0vsl~ zUw;#J*GX~A5ij%8NFVn&U6Ium?%927a`R$)H=tM1Z6?HxLd~bfZp4hLFhW-^TPBYp z#lXIt#q+1UF(+)yd>Q@ldI$dsRL?uB3Two@*37ecok24!Ik@ymn1iU|Ex!RRAHDI{ z`y?AuXl7G|y(UEs$XJ&;AGg+yu34RAuZL++{OF#OXcN*RV+&EjnY``9*?aq2(4U0B`l`8k`B{DY5hoBp13=F9;{pDx__4-+69*NJgYhx^h0L0!WnHpQ$0uf zOE~Kj8`-Hd7e_3w3zorVEDAmD&@}axCakcHOD%lyR|-3;qoZ?u^wh%1f;hYX0Yeqd zeQ*rTv*2Fd@PBF}`c29q87FqjRKr4K77k+bey1m{_5=@+r9$Pu9Fd#o&wTK}*f|yy z>n-T04Gf0(uv3;bCFoH2z<8J(xqD~Jh%~Yj)$1D3Jl>GV6)u%Im+rA9E<(2*y6pO5 zh6+lZ*h>{saW6*W8B^7#JdZM!+oa{C=_V>7{D$mO4%*ax0}E1WF4#LBsTV7S4u>1M zme(j>JVgZO2-vz{Uo?t*lDmDds4h9gGSjn@^au;{tYBuCQ&@zXPCb({KU{n6)zZwB zYb6@*-rX0c*G|!3*NX9qA5^7UIT$Ya}@r z4RiwFCTXVWq^1zN-QUU0Y8RpPY?5zw4d*9d8-sfxq&g)k`#o{$iME8$Z)4d{LwsVl zEmO=9<|Qyd61IAAmSn6!KeHr@b0rB5a`WZ;IB znN*JZoMvRjTG|mX9dG`D>5D!gyB|Mne28?YNN-z%xz}-^3A+c-YLrqu9o$_-WUiDP zlJ0Ril}u@k|GJMD;tiq?6iaK(US4WF0ToZ1hJrcU=MZ!rTGJsxrOmQ_OSXNzt8k|G zPp+B#7+kWfh882?3(8@L;KKLXqAPl%VUKH*d;ghF((d_Tk8xhD(%#FL>8pTM%e@}n zwo*qEb$M$kbQLQ$?UPzjRKml+ilrE6_Z7#ewEt<+*^a0e0M2l=JAAjvpQG$YYZwRJ z?awjMgAH-=;k4I%9(GX7sQnx(1S_V7auDtVr!>qMy$u`lG>mSIp_FR-$Oj=p<Nr5w2QMA|Afu7Xv9c->U`j#9{54(FZwwXir825Jwi14yZ>=(+XdSbfni^#i zp+~tvI>|S#$YOv*ycPG)V>duvwonS*I_E7v+=Xl*Mq%yURq#_`GnMIyyGdwLzj|N*Cako!!K5`AQx`LRv<8$;X#Ax?J zIB*%87CSPP*{FNik_{`I)z9(KcJEQBP7G-S@b*<4OJ`0mJ+rL=7-LBKst*`ppF~m` zm+n4YmNiO8`_;%Nov!vw{w_jLp7}~|6t=WV!=rX2>h9(#AB)9rTQ+(U7)AjM&_OB9 zXK6NrTqSfz;xt!}qq}@mH(rhY0-EalnuxN#e=#6qFTP+=A^b$({><~ZM7ChXV zRr&IwF7MkhHOCUYTu;}Tv}Kc6eSBkQ&WZSZ2N}bNN7vK4c{-pqxy z1BDKnK%sSkonJ8BQ8AqHf-6Ee8X#r+?2HG{7RWp73u%oR8Gi##zRDKP%al z`AXj*cQjm2EhIG4wRN%Cv@Qt*@>iTmIP6!Nzsep3f}d_ba#0-uW24Iq3Hu?>t0B)B z&8?=}0~e;8!!-pyj`y+`kbc(ksg_W%+_5RH=I8`E)70NLC-zj0TM(WWaGj=?kV6Du z+jXdsg0kHP&*~0E_a(7>2TXV&qQPEqPi3KM?#Vhz*KG zF4+rq3RMyRC>A__=F!S>ZAq<)s(kp{iI_rs-gn!egofyewFl>^maV2|!r?#n7go!> zgIXoo8@>8FZ$I%58mZ>+tbKgm!_YZXhV~lpza73+N7bmSQ}L#{%+Gz*?rTom5p%At z`)io0;pnUK_uP3a>qhrdZa&B)rbQM$;(n03C^tkh=YQuic1I;}U(4_4b;}q0FM3Kk zss@ZydgtO!*%$|<0Dhzkc3PL*c^fUp?fJT+wcv~fJ01F(X-Z&kOnJBHs_>vfx7{=2 zpjvsYoB``;?&zhfHf^;-ULCpCv z#z#~H1Ydaw2>y>5V}yEhcn#;d{P9s_{x~e;@SWowyw9+BB8~^lr!sh8c&dm88K=s4 zFn6ko2mEJxco24GgmWjx&tSM{f(^#SQ7ry!bnb~ecb$9S3uG@$aYXusKQ2;U;$!rs zH(r3fG{z+iuk7(wN5ho|4y1_!-0 diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java index 765a4356..63b1e8cb 100644 --- a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java @@ -111,12 +111,13 @@ public class CooperationQueryAPIManager { // 获取符合权限的子流程 List childrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, pid); CooperationUtil.sortByLevelAndOrderIndex(childrenList); - Map grandChildrenCountMap = new HashMap<>(); - for (PALRepositoryModel chlidModel : childrenList) { - List grandChildrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, chlidModel.getId()); - grandChildrenCountMap.put(chlidModel.getId(), grandChildrenList.size()); - } - JSONArray result = list2JsonNew(childrenList, grandChildrenCountMap); + + // Map grandChildrenCountMap = new HashMap<>(); + // for (PALRepositoryModel chlidModel : childrenList) { + // List grandChildrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, chlidModel.getId()); + // grandChildrenCountMap.put(chlidModel.getId(), grandChildrenList.size()); + // } + JSONArray result = list2JsonNew(childrenList); return result; } @@ -188,7 +189,7 @@ public class CooperationQueryAPIManager { * @param childrenCountMap list中的model是否具有子节点map记录 * @return */ - private JSONArray list2JsonNew(List list, Map childrenCountMap) { + private JSONArray list2JsonNew(List list) { JSONArray jsonArray = new JSONArray(); for (PALRepositoryModel model : list) { JSONObject object = new JSONObject(); @@ -216,7 +217,7 @@ public class CooperationQueryAPIManager { } object.put("icon", icon); List children = null; - if (childrenCountMap.containsKey(model.getId()) && childrenCountMap.get(model.getId()) > 0) { + if (PALRepositoryCache.getByPid(model.getWsId(), model.getId()).hasNext()) { object.put("leaf", false);// 非叶子节点 } else { object.put("leaf", true);// 叶子节点