From c79034ba654aceef596b0bbf5d91dc1ae4424a49 Mon Sep 17 00:00:00 2001 From: lijh Date: Tue, 3 Jun 2025 11:06:47 +0800 Subject: [PATCH] 20250603 --- bin/com/net/connor/ld/plm/ld05/CIForm$1.class | Bin 2261 -> 3021 bytes bin/com/net/connor/ld/plm/ld05/CIForm$2.class | Bin 2335 -> 2335 bytes bin/com/net/connor/ld/plm/ld05/CIForm$3.class | Bin 2751 -> 2751 bytes bin/com/net/connor/ld/plm/ld05/CIForm$4.class | Bin 746 -> 746 bytes bin/com/net/connor/ld/plm/ld05/CIForm$5.class | Bin 3375 -> 3375 bytes bin/com/net/connor/ld/plm/ld05/CIForm$6.class | Bin 1449 -> 1449 bytes bin/com/net/connor/ld/plm/ld05/CIForm$7.class | Bin 2472 -> 2472 bytes bin/com/net/connor/ld/plm/ld05/CIForm.class | Bin 26259 -> 26599 bytes bin/com/net/connor/ld/plm/ld05/CNForm$1.class | Bin 2261 -> 3021 bytes bin/com/net/connor/ld/plm/ld05/CNForm$2.class | Bin 2335 -> 2335 bytes bin/com/net/connor/ld/plm/ld05/CNForm$3.class | Bin 2751 -> 2751 bytes bin/com/net/connor/ld/plm/ld05/CNForm$4.class | Bin 746 -> 746 bytes bin/com/net/connor/ld/plm/ld05/CNForm$5.class | Bin 3375 -> 3375 bytes bin/com/net/connor/ld/plm/ld05/CNForm$6.class | Bin 1449 -> 1449 bytes bin/com/net/connor/ld/plm/ld05/CNForm$7.class | Bin 2472 -> 2472 bytes bin/com/net/connor/ld/plm/ld05/CNForm.class | Bin 26069 -> 26367 bytes src/com/net/connor/ld/plm/ld05/CIForm.java | 41 +++++++++++++++++ src/com/net/connor/ld/plm/ld05/CNForm.java | 42 ++++++++++++++++++ .../connor/ld/plm/ld05/ECSelectDialog.java | 15 +++++-- 19 files changed, 95 insertions(+), 3 deletions(-) diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$1.class b/bin/com/net/connor/ld/plm/ld05/CIForm$1.class index f2c3014b3b547976210a1fdf6b9167467ae35f26..a8a2119937f721d24fdba5b361c61f3f1fe88981 100644 GIT binary patch delta 1403 zcmb_bTWm~G6kYqA`)F@2?UZ8L5z`iZ#E>AAw%*iG^(ytOj`kX@Y0(Y|smuow5%F_B zs6;#>kHXMu?Q_=NYwdIHec-u2-01po z;}(F)h+a0LG9?wmP-3Fg&QZoIGfd31S1N%V1G6z##~gyEF|<20Arfj1PY5i83OTkpl+PNzf zX*E!e1tfG1vgj&| ztH_iS9dI4lag1uGJ$8+jYj4uE-08nzEbCf_BXD zDxE0vDjAF8SkjJ3a*B2yc>%AQsl~C3DJPJT%x+_L997i^G|JSxY8=&PdLFv%*Z(fO zuTQupA?)(TWvAX$+rs8miLKx8n6_r!dqRGVRxpOvsZRuA@JW>_eaP zGJByuGWY+J@yYut2J%Sxj{G_9?esUE^u695uY0M6Jr>9Q&6OSeQz=N}cmYKmpYq4} z4EcDDV!S{lUZNJSa15_;5^r!3Z*hb1J$%Fye8LBOrhI&%0KQTQzR@Da)##yc@3%^H zhy)#`m_kP=h0ancT_J<+l1Yzf5WSvc*vvCC-sw zT%#P(NqM51MvERAD~XDb&Q^~*wxxsz8JsyNgw3E{RL4jlpDfhFit*o3OjX!|Fwa`c zaVspSIDr5fn5gj_ThZvOaqGkyUBP3g7?SRy%dMq%NuJ10^29Y%xIEE`l7z-K_A`U~ zx&~qqHsH!eSk@I|l#t-vL}Ok{v~wz&xXD@!>EV;tbr6w`avgq-Jfly1M`|}LC+o!? p|98;exzlx+orWQxT_XL0A;^PO|P%X!-Ltloa|=l(-r z3ukBSNn@=|lI;PuDeBMXuIJjua^s_IJ>!%4(fk#M9qiPW*3F>z+-FZigN^6;^)YT5jxWkk#}$q=_h6^aCTT7tA`d&*6Zs7_BSZ@j-_Hcf4MQ z{E^yt(BZJQ{RMs3Ur=ZCM(c*{o4~*iYEaKujXs9;V{2WeHCmy)%&sDK)VhP;EG;qN zsCAphu=$8k*lgHaW?#`27^Mxf*t4XJ%`T|0rc85@5%=Ov_Uml0S%(8Fbu8#ldhyHW z^#7leUCKEmIf<#|{YFWOHwnp^VU?UOrHog^c};>hbn})J?>NUi7kJM_K2YEzH~GXg zpLxy~UhtJU7Wl?@W${Bb@k{mbTlG^_14>cH6dWh$_C`GovcyFhhEO$hM37Hbc5#$p zX*j`Fj)}vRHNA`6H0>TIE7Be(i;|1F6A~E{rW9SOk|QFE6R463&=DXO j`-!S@$-C6><$qY@S&{q5aZ3KC)N-1exo92*P}QcV-|H3<6AC4C+ig45m!H3_eVJ41rAi4Dn0?47p5# d41G*O3=5cq8CEliF|1<}XV}i9H+d#U8vxAj46FbE delta 73 zcmV-P0Ji_15}y*Va|Z$e+>><&?luA600;r#01yG;04D+C05t*R089bp08s(v0AB&; f0Br&20FD9a0H6Wt0ILD*0ImV<0Jj1KlbHyHXiyk8 diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$3.class b/bin/com/net/connor/ld/plm/ld05/CIForm$3.class index 503d6ff2cd408123224e6805c7ee2bc115f7c76f..fdb6419f511e230cc084fc97293b056ad82a09a9 100644 GIT binary patch delta 127 zcmdllx?gkw2cyAeMvhC2xh4$kOy&$yOqL8vOjZomOx6s6Og0R~OtuV-Om++tnCuzm zGdVDLnaf2Kgj5T+o; fD5hY>RHiV-0;X`rN~Q?LKBid4Nlb~89k}WNNbMON delta 127 zcmdllx?gkw2P6AtMvhC2x!erwOneMdOacr_Oo9y7OhOESOu`JsOd<@8Ori`En8X<7 zGl?^-W0GLl%OuHghDnOyHj^~N8zvb>K_*#7StdC~Jtk#FGbR;AHzsvPed9Jb_V?b delta 23 ecmaFG`igZ!Difpqd9E(FTG5 diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$5.class b/bin/com/net/connor/ld/plm/ld05/CIForm$5.class index 6a9ada9286e3a021e99919ddff2acb122280a4a9..4395c01bcc6e93a6e4887d8bafc9a9680871b4cc 100644 GIT binary patch delta 104 zcmZ24wO(pN6&GXv=4!4Y#?T@LUZxTT9i~zSbEYx|C#G_SP^LSW|&>SB}v(#lM|jQUJ{j8;q&Cp+=H F1pui%8@d1h delta 104 zcmZ24wO(pN6&Iu1=4!4Y#!ycNUM6n_9VQMQKux0`Pc{dC@ diff --git a/bin/com/net/connor/ld/plm/ld05/CIForm$7.class b/bin/com/net/connor/ld/plm/ld05/CIForm$7.class index f65cb93d578be9f00568fdb7991dd7f83fa007f7..bc0196db96990316d0157eeef41960b14ca2b057 100644 GIT binary patch delta 92 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 JUaG6<`46D5eFOji diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$1.class b/bin/com/net/connor/ld/plm/ld05/CNForm$1.class index ace63cd94d84346191ccf26f47d379ae02104d48..9521d836211e5c906660a125d7aaa328dd92176b 100644 GIT binary patch delta 1403 zcmb_bTWm~G6kYqA`>4s4cFL$}2h)1=5z{6JrRq(Us#hs3)zMzl)~H8^gjD7OiHP{Q zA6kicL?WSy2qr=zB2q~cUr0Q^JU@tdL{e1k+dHH2iXZo5-?h(Kd#|<6x%Zy?cABf} z+m&koCLnU&6_H5;Fa$*grdpXwzB0|gbZfa1$aG;QX6u+ma5n{a1Pj8!=1@UtbHogp z+YHRXT2=YbSIT!pWH?SB?)y%Ei zgW(nzO0d+xGAw6G$c)%MN^^hjV)IrQSZSBaV12!vuQIS2RRpD_ahFM{kU6=f_AF}* ztVKFujCEZ}w@xc5$~ptJ)>UQC(4@M};q9B6TX-sJBqY+=)>L&LZL@But$r1d&^gGw zi*Q|pM~<_>Wn{!KqMdeHHCmRnPS>)g{Ir2qo8^=g%W*N}Oi`^jT1K?otNJcuMhx@X zG0UrTqS&jXE{tJOJI2e2+G&gocvX)U!xE+(L24qqj+rr3RPNQtqj}XBDo^x2aN1Y@ zEWEp4xF#;_@Wy7O=rOBFcmG!pfgjVjeA;oSN=N^S*QXuBV0*~qA44)>r0j4U{c>b) z`<)kC^Yvj_|DKFb-dFZNkCgAopXuDr@5U3ptF3(9OEv7VF#30{?BJhDK{CfP$m4j2 zKgPSr#yu3`KFaX`wRnibc!Z;PjI(%xD~xa9DWhk2i|3S$7ZkutD#9yTz_=3cD1`Ua zh!3*259&j8j0CdDL_N$X{~d)?fei@p zthF2)U_!+a1klJtjpt}Ulf6cHi8Z$R$S#It!(C1-y-x5%c7i7^q0HflP87v8HnN{- z+}AM>4YL79Hq5e)7^AoZ@5USRTD+ZIv5A|k#-Lt4d0ht)=_t|R=g2eqL^lTXz_hbI r?Dltq{>+`+N0`L>J=o$jVay86tRS!%TllT;#cxFmBNy+ng8h64^fEa? delta 701 zcmZ{g%WD%+6vlryGntTKBu%ZB#6Y7^14=21LTG$dYi-k5Ypto)M-w#`wN|UumC!~0 zgzLhrbW_{}q)x{$PiUD>w88-|1#^$UWa|UYP2kK$NL@n-SJu- z@<(gq0f&Ry_80YSe^H&%>#b|HZyWJG3yq7v%JVe zV%AL>BIW}^5wm`Gg*_!#V3gO*V9$^?HoBn7stQddhTV%d*{gHGCLIYZ*YTh~<;5?Z z)AxT)ZZYS8%vyEnqrONooJ45Di2kRYE_c5;{@ z*>IB091({pH9ZU56m1?S6&a6{qSS)!m_)|K>17-j6tmPyHLAJbF-tB&W0b#|FnE(I) diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$2.class b/bin/com/net/connor/ld/plm/ld05/CNForm$2.class index 5ab9c958abb4d997c135b2795b87e67d1164e761..66114a841a833f84bbb77f64f4c71aea2150b68d 100644 GIT binary patch delta 71 zcmV-N0J#635}y*VbO!lXVC0HPHYF0nz{v0n-2{0n`9B0o4FZ0oDLf0oMRu0oVX- d0oeeK0onkd0owqp0p0+v0p9?(0rZoZ2!=>n7*zlO diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$3.class b/bin/com/net/connor/ld/plm/ld05/CNForm$3.class index 8699a0e1604b6421f298627b65bb208bb6a1a704..ad4b758fb53f777a06d4a478f87a0775305f67fa 100644 GIT binary patch delta 130 zcmV-|0Db?z6~7g*{|5pBAhQ7o(E)A(Bmf5jCjc4(DF7k@DgZkID*#afEC6!?EdYT6 zE&z}MF94qcFaWLsF#x>+G62j1GXUEHGyv=ZH31O<_(LIGL=Ljh$1MgedFM*(>PNCA!lO#zYuQIkLle`#(QU;qFB delta 130 zcmV~$tqwr}0EXf3d;J^^0_Jy)K+r@*kyNuux@tB_GB;qx1-JvV$>s(W*)7O|&3K+$ z=~g=b0{p%>_3+#u1^%k;pIS(LtTAXwOdI0bkXnITAdpd_fxc&nK*B6=q diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$4.class b/bin/com/net/connor/ld/plm/ld05/CNForm$4.class index 3f64b57a8d1be874a71cad386ec4b27e0d18aa56..92cfdf4bce4851031ff5cdeb09ddcdbdeef98e9f 100644 GIT binary patch delta 23 ecmaFG`igZ!DidSGd9HrUuOb delta 23 ecmaFG`igZ!DifpLd9Cg@#?T}NUZxZV9i~(UbEY%~C#H0UP^L_V45loGYNl+4KBgRo zg+TdLO!*A!nF<(=0qN^ZB@7RkN*P`=l`*_ys$k@1s$>)g(h5v9jG9cfj3!JClbv|p F0svu&8YTb$ delta 104 zcmZ24wO(pN0~e#|=0>g@#!w3eUM4FB9VTlAb0!-GCnj5lP$qkZ3?>JLY9>d9J|-uI zg+TdLOs)*;ncNtT0qN^ZUJMVIycu3I`7pd=@?+#?@@EtW(h5vLjG9crj3!KBlbv|p F0syEM7GMAX diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$6.class b/bin/com/net/connor/ld/plm/ld05/CNForm$6.class index 09e2efe8b4765ef5aa7cf572d79c1a9abf33eea8..09e09060d8059ca59d8d31ec6d44739bb1df9813 100644 GIT binary patch delta 55 zcmZ3+@nbH}|m@*hFnKBui LnDQq(ux0`PW)};4 diff --git a/bin/com/net/connor/ld/plm/ld05/CNForm$7.class b/bin/com/net/connor/ld/plm/ld05/CNForm$7.class index c5cb95160b6d0588b35878ed6006fa8b79bcb364..0228dc3dedc6775925957fd6a35733b23df468b7 100644 GIT binary patch delta 92 zcmV-i0Hgn?6Q~ogx(5NNv%3c*0ZFd_4Fa+N69TgU7Xq~a8v?fg9s;-kQv$jGTmriQ yass>ndjh=xm;%25sRF!#Ww*tZdy#m7k!2-ts#sbIy(E`i>009s-U4Qv#3xTmq2* yasrY7djgXHm;#jmsREV&u>zL>w*r^|y#kp4!2+EC#sZ!I(E_3X7{;^Lkq{Nq;Wn~j zc}`b#M-2x}m#Hpk3f&}K42Cp%-h`q?bN4wk>#kaNt+Uqe+rP)Re|zu$clJK`0c-Yh z)3HvjADQ^om5NYhrv~~2(IRwr=j2d>tUB&-IT?#qaw>E~*1#KGIZeb)&YLoI@`RjG z`PtdoemSm+T{%Oj;lo||ieRpvZRML-`8E_6=+?tmn@w0_#!Q|*gYZ3AaM!fF$#+f2 zGwDN3>5Q?4_P(*BCXC7Jmp8d!;siqHPtJS5n1>!Lm=c;4=*xbgf3<8K>eku{J>Dvn zEkirorj%3!*2V|f4853&KeIXR<#l*~EijSSV+PYOn=SDyTVV}bV>@rcJ8Xw?rsHF_ z$6muVFrT+_KD)D!J-CTIS!N>p*_+4M zhr#c72QRa)ie-*U=AEiF`>8D6qxy588qPs#8V9S{9HJI-s9I*mt2kV(;|R5pxhl+& z>Mf3vhP+>{W1ggOjCAB!>BMo;lYfz394`YnK?XBl@;FJxvOuPCip=0Nnak-ipEHB9 zj1Nm8AC>idOkQSCws4kg<80Z*CuI-k%0bSP&p6+l-2!t^&&UNnD;K#)TU@MNF40MR zUN_`YeI1wSG`^ravQT&8i@GOQ=w5tD-@}o51Xt^E9HFOkt$vgn^iwR-3;D8M!(fqq zog4K&zM>ECRb9c?^j9p_=eS8%v&4$!W~&*uSQ&iN>daE>cD`i|MX;BzY27Ova`zqCWVv_}(3H46Wt#bfr}Gub;#PTtJLOT9%VYdR9_KL$^0d*#d3k~tWw!F8+RvP7+t=ha$y0Z#%bM$#at2^hi>I>KIm; z0l#N?en}6jfy;4sn<$h+%aL{!9xg-IK#UjT`E`1jI|fDFUQAey3@SpiQgjWPwr~DF z8FO4Fxt_CQb6|2`_UMaJNY-Q(wPcr;PNb-E1o8%Ak1G9=Sht2Ub z$sf&KT~qZ2pDyKdLlWfZRxWK5mSbU+8|KO|R|QMu_z;>}?O9u;GT^UG{oJH_`hRoH zBEs^8&ajK%k8ENXOXJ%IoFscW;v@CZ4s!yIX{NScxzf;;J>P0-BHLQ*ISEn~**-Vh zb0s}Nz6`64h9$Dy@$HlAMfST0jiWKuJCf+TauPcIO3-t4q$+eaw|+1J|B&Pw2G6zr zNNo=G3bl#-p(+xLOca){Uxz{}x^o@cpa)k+t;TGCHf{mrH6y^kBTkBgNRdrQl{avs zlo+{hMt9j_)VB@2WIG1Pn;0!SjO=$}mXu+kyloV?3oB)}k@|ZmmOUty_pw{baX>ym zg?xxJve&3^AI{5u{3;*OXYPbVsbGp6XPTT~JE>%*oaAlB_Lt!2=C(O)E|D)-C{QSk7{@{J=6f$9LsC56X``DL?TWExe?)vb3dKZL37>s8sD&ZFP+5 ztYcMIT}SoNb=6=Ur}A{Xnxqrd6rHGM=_IvCH&n}Xa#WesL3j}bUX`Xn@|~&xBR=_$ zLCVN=k$kWALJ+6s%2|UnQq*+$0WK`0swr|#&Ko7)$O39KhJ$>h$psU2F$)dlM`L|h zftl*4;d8Mb_sdUFUonQNV3sNI;{cN6B3d8@=YK;?!R)BdH4lh5nFjYTzB_eVN#pyrss93Ej)lMg delta 2444 zcmah~X>^q36@H$3zb%unm_Xzs1p|Ujg`mWQBokrdw5nyg^Dyv7WPu$%menc9j$?Z_NW zVXkKIR?XsV+M7KzkGE@o_R;~oLrd95M>1b0@=l$^zB+>iI*a#&bOHNm1@F^WS*WYo zUpKHwH*$c!$70>ifx4R|`Y{LVQ4Y~BI84v*K|Rmmmd#Sj;|QxIM_R2o%Ie5pS}7cD zWpIp@#WJfmAGPv0-nx(7tidd|Mlszg=VWUNr&u#N)tbvEtYr*Mwcg-wtQtOPeaNS* zPdUvx!5LN^pSCV@wjIZ3>~?(C?#6j`4xhLC@CCbwVS5{q zC7*bsWnWcEzY6C;`4qA88Cu9ew3b6imczI~j-ay~MYep7JLDJ&oWW)}i(PUK`wf3WF5+vs94>lbrwv%js+0kB60+f` zgMhk-*BG=_56K!pXN^Ug#vw--i(pj6{9r`^Yj)}XgZc_2G(geY}HKE zXcqQpHflA9gW4S@H5YYyE6(d}sMnsf^mew;UcA<{b_czK>6*{nkltz9@-9x+zMP^3 zd|jKdTJPoCdLMUaAwSalS!-tCsK)XeeSqh6fcRQ0t#zPWuO-q|2T6AwEWLGz+@nLK zzYdc}%sXC(%kx?)i*ID5@Bi00M-`<88-wqEN91J-|(cO18=|_UCCG)DKt@J-iCd8=^Eo>yZbhJ8bFr_FJ!9EnI~_^an>U-+(0OQ3LC?h#9Y*960KadL5mh=t#2pjm(e0PzN2XgdMYBXRU$rGv-n$*nn#Pa z3T+y6k{`8m8_Q{>H7b3_N>k$&zISM1$j}Ktvhoas@7O=aj`<$j=zioCRYoI4^gnMv zkZ7)BZ=@oNJsV!j92H;>G60=sMrS$__304W>rABTEM)3zWa%7q*SW~o-=augz;F#? zg3ia2x&U*u5-;c?RO(_gJ1=6bzJ$%X1n=rne5fzufWCsWx{R(aXFFZNpPH?Hqpmb3 zqLMvzojCz-n$^F-Z21U(rPVAqoBlZsZ8Ar9Ggs<1R_R~O>}=;d`Zw0-4j#~*Jgzl7 zqr1%Pd?1$oL*h-lUZ=aIlkSl&x>thwvE=D~Ge5NrGqM#4(NXwrMhvBOW-pmLYN&4v zC1!5&^o;C;BGGuC4Z(wj_U0N|XagI=k)r2}%)tb-(({IL@f@n;fN^$Ei6wfWLAKm1 zt8C-p;ayXui?RbT=0YdyCB2LQ`xvB!sDRCKe4_Qn%H~QeYw&PbgQjK?wt*`aLf@0Y zAA}dpzm)hxrdLd+jUnn0V-f)J(d-IRU1Yi_aM>hq35Aypemxd83N9c{t|9>21!rX!A+4SE=N>&dD< H!#B#eLjP5| diff --git a/src/com/net/connor/ld/plm/ld05/CIForm.java b/src/com/net/connor/ld/plm/ld05/CIForm.java index a3ad43d..9b3f383 100644 --- a/src/com/net/connor/ld/plm/ld05/CIForm.java +++ b/src/com/net/connor/ld/plm/ld05/CIForm.java @@ -224,6 +224,34 @@ public class CIForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_HighestPriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_HighestPriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + + if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { + ArrayList columnsB = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columnsB.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsB.size(); i++) { + if(!columns.contains(columnsB.get(i))) { + columns.add(columnsB.get(i)); + } + } + } + } + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + + if(columns.contains(column) && column == YNCHANGE_INDEX) { return true; }else if(columns.contains(column) && column != YNCHANGE_INDEX && sfsjgg != null && sfsjgg.equals("是")) { @@ -236,6 +264,19 @@ public class CIForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columns.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { return true; }else { diff --git a/src/com/net/connor/ld/plm/ld05/CNForm.java b/src/com/net/connor/ld/plm/ld05/CNForm.java index c63d120..4ba4422 100644 --- a/src/com/net/connor/ld/plm/ld05/CNForm.java +++ b/src/com/net/connor/ld/plm/ld05/CNForm.java @@ -211,6 +211,33 @@ public class CNForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_HighestPriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_HighestPriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { + ArrayList columnsB = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columnsB.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsB.size(); i++) { + if(!columns.contains(columnsB.get(i))) { + columns.add(columnsB.get(i)); + } + } + } + } + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + + if(columns.contains(column) && column == YNCHANGE_INDEX) { return true; }else if(columns.contains(column) && column != YNCHANGE_INDEX && sfsjgg != null && sfsjgg.equals("是")) { @@ -223,6 +250,21 @@ public class CNForm extends AbstractRendering implements FormModel{ if(LD_ChangeForm_MiddlePriv_Users_Config[0].contains(userId)) { ArrayList columns = getColumn(LD_ChangeForm_MiddlePriv_AttrName_Config[0]); String sfsjgg = tableModel.getValueAt(row, YNCHANGE_INDEX).toString(); + + + if(LD_ChangeForm_LowerstPriv_Users_Config[0].contains(userId)) { + ArrayList columnsC = getColumn(LD_ChangeForm_LowerstPriv_AttrName_Config[0]); + if(tableModel.getValueAt(row, CLRZH_PERSON_INDEX).toString().contains(userId) && columnsC.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { + for (int i = 0; i < columnsC.size(); i++) { + if(!columns.contains(columnsC.get(i))) { + columns.add(columnsC.get(i)); + } + } + } + } + + + if(tableModel.getValueAt(row, CHANGE_PERSON_INDEX).toString().contains(userId) && columns.contains(column) && sfsjgg != null && sfsjgg.equals("是")) { return true; }else { diff --git a/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java b/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java index b64fe31..01ab772 100644 --- a/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java +++ b/src/com/net/connor/ld/plm/ld05/ECSelectDialog.java @@ -729,11 +729,20 @@ public class ECSelectDialog extends JFrame implements ActionListener, FormModel String ggrwxStr = formBean.getLd6_ChangeTaskName(); String nycdStr = formBean.getLd6_RWnycd(); String jjcdStr = formBean.getLd6_RWjjcd(); - - if (ggrwxStr != null && nycdStr != null && jjcdStr != null && result!= null && !ggrwxStr.isEmpty() && !nycdStr.isEmpty() && !jjcdStr.isEmpty() && !result.isEmpty()) { + String ld6_RWworkhour = formBean.getLd6_RWworkhour(); + System.out.println("count==================="+count); + System.out.println("1============"+ld6_RWworkhour); + System.out.println("2============"+ggrwxStr); + System.out.println("3============"+rwxzMap.get("EC")); + System.out.println("4============"+nycdStr); + System.out.println("5============"+jjcdStr); + System.out.println("6============"+result); + if (ggrwxStr != null && nycdStr != null && jjcdStr != null && result!= null && ld6_RWworkhour!= null && !ggrwxStr.isEmpty() && !nycdStr.isEmpty() && !jjcdStr.isEmpty() && !result.isEmpty() && !ld6_RWworkhour.isEmpty()) { try { - score = ggrwxMap.get(ggrwxStr) * rwxzMap.get("EC") * nycdMap.get(nycdStr) * jjcdMap.get(jjcdStr) * cskfMap.get(result); + + + score = Double.parseDouble(ld6_RWworkhour) * ggrwxMap.get(ggrwxStr) * rwxzMap.get("EC") * nycdMap.get(nycdStr) * jjcdMap.get(jjcdStr) * cskfMap.get(result); setCellValue(titleRow, 35, score == null ? "" : score + "", sheet, row);// 得分 } catch (Exception e2) { // TODO: handle exception