From 89e829781e32663aafa56941973d4bc7c8bad904 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Tue, 16 May 2023 16:17:24 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20isAct?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mysql/ReportManageMapper.xml       |   4 ++--
 .../mapper/mysql/ReportManageMapper.xml       |   4 ++--
 .../da/sys/controller/MenuEOController.class  | Bin 9257 -> 9328 bytes
 .../com/adc/da/sys/entity/MenuEO.class        | Bin 2776 -> 2981 bytes
 .../com/adc/da/sys/service/OrgEOService.class | Bin 4955 -> 4967 bytes
 .../classes/com/adc/da/sys/vo/MenuVO.class    | Bin 2943 -> 3148 bytes
 .../mybatis/mapper/sys/mysql/MenuEOMapper.xml |   3 ++-
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index 4bf88c4..e58e00d 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -228,7 +228,7 @@
         ORDER BY updateDate desc
     </select>
     <select id="isAct" resultType="java.lang.String">
-        SELECT rep.name FROM
+        SELECT pro.prc_name FROM
         bus_process_name pro
         WHERE pro.CREAT_USER = #{Vo.usid}
         and pro.SUBMIT_STATUS = 1
@@ -236,7 +236,7 @@
         <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        GROUP BY rep.id;
+        GROUP BY pro.id;
     </select>
 
     <select id="selectByidAndName" resultType="java.lang.Long">
diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
index 4bf88c4..e58e00d 100644
--- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -228,7 +228,7 @@
         ORDER BY updateDate desc
     </select>
     <select id="isAct" resultType="java.lang.String">
-        SELECT rep.name FROM
+        SELECT pro.prc_name FROM
         bus_process_name pro
         WHERE pro.CREAT_USER = #{Vo.usid}
         and pro.SUBMIT_STATUS = 1
@@ -236,7 +236,7 @@
         <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        GROUP BY rep.id;
+        GROUP BY pro.id;
     </select>
 
     <select id="selectByidAndName" resultType="java.lang.Long">
diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class
index ebc333f20ef1e4613b2001f64ce798e01d6b1bc6..aef06555286ce5bd048a560e67ad9eb771d852c1 100644
GIT binary patch
delta 2875
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
UmNB}&a;{_h8~6PkALEn%0sF=lv;Y7A

delta 2691
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

diff --git a/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class b/adc-da-sys/target/classes/com/adc/da/sys/entity/MenuEO.class
index 8f5bca5d6875f1f6e8070181d38004ddfa2eba55..7f89fcbb965a4d21f8ebf72bae3c0a47a0f9a996 100644
GIT binary patch
literal 2981
zcmaLY%X1V(90%}UC;Q00AchbKgh1je3CjAwCm4kgWN`zLO(I%a<z%->Ms{bcnOP-P
zdC@Ap=)nsfyy$@{ORFs3R$&zfz4_1h7ijtY{bqMqnjR1P>*sWTx~F^guYYgeBBJB;
zT9J0s`2y{tmpIfptZ=x%;Ub4s4li@K#G%1qjl(*JjXb@Qr^|VIRncgu1J`M9=pb}`
zZ@qR#kvgxavgCVV<ap7B)9&i*?AHtJkNyt+QIy#Z^c6*8^|zdNoNC+gwyKRNaJ{V)
zXmgvsr)Y$ebJDHA*`>DIyow={eB71^{UB15bHm2A|E{7v14GulNN?!?V;0}mLB|al
zrzjujjuTuBk<-_rns>!lly$@Ppv|*}r@K+a-Et>g&y5xp4bRPQfVJeew4&X0*V7le
zolPCAIh$?NjMe=nmhNB!Q0`S`qHPxwOxK%!r|Ptt)s|BYcfzXnA~)Kpu4u2jd=aqH
zmX2!4l;d;r1N>x1O5tFqy>oZ>Vc_VBj<)^QsuMUJ9pO!2H8Og<Fd0L#Mbs|$7hXht
zQplsFA^Vv}b)4hgm--vVy^}%(Evp0jT0!Grxq$Xs@3ri`V`aBrOaagI`%DZjtlx!K
z#;lqg3TE|ksEbbk*Tp&6%;eO_t|g^%Z;akCD)$EJ6-NhK<H2yGWh&_rR}~w6H)!g!
zF2D9t{0@)t2`<xpbbp!drF~_Z<uJoxio+2OhdCUg=`!u-+ysY74hJ|Kq<xB}{_mhD
zni*)`bVA)fNNa)C%W|d^jmu?n{c1xlqx&A8M^JX*qT_f_1=HO_W61Bp7hs6S@dHKj
za7hZ4q<~2Zo1|Eaq*#QcSdpYyo}^f?q*%SA*b1bRm<v0D_y9^(qzY+v;Wtu0NVf+O
zb5c1?bI6zD4m3{-C@DHh4<X+9@Xs{#z47p6>%$MzF|3duUPL;CG`Dc{7aF=fbx~?x
zr!2i8BTU4-debwF*P$SXTA{$EN35n{)AXj*^r+o5Y?@jy=@b+1ablVk(_>as#x%KB
z)8lqi#x!{_`6(uT|A}cvOvkOJtZ53ZrYG#CtZBLi(@u(s&un6v64R4bQ_eKKZ#6w-
zH|0#z2QYn@V&eOfn2w0)X{#x3nm)Fgp0S(qrs)%yK20(4T~17g#q=zlK$Us#MoiOZ
zR?|s(4)^G;dpBa5uEX?siiy87iRqA-7OneKFil@rP0!o+sbHGEgz2jk6MrKU(|$3%
zU^Nv@(+#WXl-*P`P2a%uZHkG%--&5LOsB1;l4<(RYFe_JN~Y;Yn0`tz@qb8SniSI+
ztEp_7ezlsG?WVG6x(U<oDJK3uOH2pEbk=IBn5J7+(~EXf#Wei^)1N6O{%=i82gP&_
IafoXF0gqdW_5c6?

literal 2776
zcmaLYOLG)e6bJBgC-Y7Z#6S`rF#&uf;nAq5C=eeZ$lwG5lLQxTI+L5E$xJuZ-Gjmg
z7Zg>xaH9)1P~}2P7FbfnqsoOJz%Sz`fbxHC_cX)hwu_u|-~GF{Z%_Vt_SfG;bc~j(
zw2jVGs79Z2ILo2V;T(rAI5apca5&H50*6Ho7fW=hM9mT{2^tDz;5zLU8HBFyE!R&A
z66XZf=6o-V94}gN+Fe;V@cT^r_P@bXLHW%<t_vD&Tyd^BcH8kb>}C|W-o^>^xh>xl
zROWP64Xbc*uI;wAuw+_}`|_b5M1qQL*xdBL7PO;p$+{QG4H;m~>QxzZ+>mjCN`dS+
z!B&Wp{3fb<>%O3Z8!iWJtaH-!+-O$Nz|`~#EOY*v6tunJdh&d?vnqonXSI!%;fCMB
zejV%@^`tQ$ZMs->qS5j@wzJl<*Bm>%9@^52+~~T!AieJV1!&3}GOEYV+c`De2TsqR
z9Ht{ird}Svw4ntVZTf4APT+K8goDQ}vF?0tM^!A5R!Zn;s)H(_IWF<&OTCle(P^cI
zp2fZctD&>MUO|67Iq#7dHt_t!E11(8Gupp}-Vojcv+C+?Gb<^fEq=A!7MBK-aY-#1
z8`rF)FS#F9(wS6;`g`LExU1?>YDC;rZTj7yCC|A0Y6s)@bcC;_MF;3Li}ur~Mf*7H
z<uJ)%g2OnyYS9>%MmX%^u$#jk8WlADfA>Jp{=V*2CzQQ=vJ^-;uda-so$3Q|eY>eX
zF!u&uH+X9JZgDS(pEN|TpgfEZI!8P32Z}1gr7~111Ew-;Dq}AyV-qT4M=E1`Dr3Vc
zWB15ocm@sw@paT}WPx0mc|ziW8ukWaQ8iA`n<!iH0D6n2P!lvwGl(xven`1LwaHE6
z<b!kwJLAc-$T{TV%)v*Ld;aLEYQ0Pa`ckbh8jngI&othLpu?D3z~LhaI$|^p=%%lX
zCfjTp&`l0Zs~ILf<J7cInT{GwdEK;bG`(#$<#p2*OzjL4-;30=SDD^1nhLt<s?qeW
z*;LR?U6`(AnD|bnrb%TwW;7Lb(+#8PJ+rB(n{LANZH9@zm((<&Oz+bNXwvU^NjKdx
znvT<lxU(<a@se)(4yNxjO#CgUrg3HZ$aqd=-SmUebi#a2W!>~6Oh09q_;)BZjVaSf
zqp6~sem0s;nN1blbO)xp87BUXOid%oG;1_fb<;0K)5m60RX6<#({C9j{+&)uyOik@
zqiIk#-7}g#HJb)?(|wr!$T0E$jMTJSnLaa`EZy|LXqq#dEZy`7rpFm3{{NMl_9)Y7
I#2n542ZP0MhX4Qo

diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class b/adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class
index b0df26d8bf4c995f7ddf2ac61447057d2391e89e..346455c7966724763109d23fc603eb91d40c33a4 100644
GIT binary patch
delta 222
zcmWlSyG{a86h#*}iChSo0fUo?;SB>LiaKCnLLj^Yfsz8Oj3zezhxC^pprs&I{0zj_
zhEJgIkW-x3+I#QaKlkU`4A^>UPF0c+DJ;_Z*W5UHE-7GA#Kt8<36C-_czSKE)Sa;R
zTvOG}*gERVRuiVq1JC*x`%(uCDfrZH@riOOl^xEGtlq|NKB`3I(<Dqw(%O>Qk)$rS
y^u=L7gCSE!%oy{|gh!z>T%6r_!k2!Yy7UN$cEp?oL0;vmFsu`fkxOXr%Krz`Ln1){

delta 217
zcmWlSyG{a86h+sdiHr$e1_)w<lQ0fAgog+wB*xbeFa&A~3qobXe`tUG0a~glETHof
z=uK#C{0KMM$v&@j&iM_0!sOjJCHrBfZkaUaWby6Jtj+?CxWEu{N)?|Pmr|d|F0-F*
zLu`{GEqmuJGuNuRVtTZ=v47se-Et_w%+7O@H!u3)<Qr4pP)YH!CP*|p5DgK>@_YG%
uem_wrCSaicP&Y^1^30SmuS{r*^tGqET+vb7XR&BUdym%77o3dk<vaf=h#_16

diff --git a/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class b/adc-da-sys/target/classes/com/adc/da/sys/vo/MenuVO.class
index 6fda33fc5dcf242d6662efc4e3f6aa6097688b5e..226f5464c9f270581070d4947bee7d40b9768b45 100644
GIT binary patch
literal 3148
zcmZ|QOLN;)6ae5O$B$T+TQ{$!=>y6$NulCV%A+AbLQ74ZCe*20U;&DAYm3-YN0Qqz
zEMSHO%&>r&E?~g|W>~-si*^Qv85aBieiXwwNA`_-d$c)6_oe&Yt1Ic>|Nj050M5V%
zHq_wVG8}|U6dDvZC|stnNnwk^dlarvXj0gwaFs%f!nG1yFTwj3<hzl&VZl`66YrMi
z_Pn6uHj~H?I_I#>Z-;>elawxUw=!L>_x$#r1yy~Ww&mk6N-VH%s;KYBu}?!wk?MQV
zUTi^eNA<#>W5M*;O!Xj99TnkJML%wK!`nDQ-AU@fjnIOEA771nG=01_ND{hTam5e(
zWYvO+#ibVd*27(8!NG<fsLO-?j*7OuogUUqHNv*nYk84R<zZz$>G}v+Xtcw=>+QDP
zUC)g_jon+JyP<+XYZDojj!No!x|zkLF|6K}N<7|acJbjpgsW|+q#N#Td6CywiHdOQ
zNxpl!D82_@masP6!4g&uuc#+)KGhAcu&&8lOm*p173;Rf_PdHL<7FG$uZ$jnjg7ic
z#+J3=Bbj|*o%;`^i~~k}=Ej#f>O$+J8`Xyoj|PmcY3lQ%XGv4*0&lWDQoNhG<j~#r
z&zM6u+%ML~ThpDYjrT~a%1yr$c*!8blW<me+S`#*t<4poWq1x&@g&&Ia1gcC1)t7S
zC2crO?}!7B!bt}nfhh-0P&h<kn!;fU^AwIySb(Dr9HVfYiZc{uDa^r?1@l?QP;5%g
za1vkL8h!?<kfV9=Do0au#`|-|DLCUSoKeLYVVu#%8F`#h$QhBGaZ#Lcg_w_mMGMCG
z7?xbj7Ush8UtrzmZjWOua-|JV;I)%>fG6Q8ELre0EMk0c@E?%7XAHh14qk#~Tp<l!
z#hk-jTt4+D<o2hwxpor@u*G+nOM4BcCmOB8f>SuQU}1qw&xoc8)6^7A&&s9=({v3@
z*E3AC$J%s)O{Yau-ZXtEnq1kGH%%X*>EjF&ohNNN#HQy&Q^7Q~Mbq=LsbHEqXzFH|
z=xl4#G@D)!O-0kRCz@WAO-0ibqUmOaiQXq|I?SdsqN!w>V$t-HY$}<i+i1FzVWM|i
zo95YcRy0kTrq4vv%d%<GG<}YyFEUK@ozbQvY<dM=#VYe#P&Q3pil*1#9KPEReGAH_
z=_@pSonfMHo;EG8X+<>Irs*5e^tx=aP1Cn%`Yyvn-(PJy#->&A*;P!_UD5Q0{Ol^G
z>3cN&kYS>Kfi@jy)0?8nF-<>;rnh91W14<K)6W?u`oC$@44c+OQ`I#6BAV7^Q`I#6
yil*N(O!TkSrdc+<Et(FPrr$-=dD(QpG~Gkf{R|WR_qAybO*y#0@g2Cxx&A+5<&BvD

literal 2943
zcmZ|QTW{P%6ae5eo4tCyWSd))wm@2LNm^<yrCb_PXh`X{n<mXBkwEH$vzcz(?%H5`
z3q|4qBp%>_2atFGsSoWRC=v*X2YvuQs_Hpo@5G%Rznn8y&*vG>?*EVf{SN@n!Hxyv
zaJdH0!KW0iP-s!OO5qxXHidNx*C}jJ*rafS!d3-371$O~JP7420Tb=p?p@dEyME8<
z#G&W+E?}S64SWGrN>|jd8WmUjUiXfGhAt<4#V8140oE5X9C%UW(bP&P2X1&L5>Vcg
z{lM=Dn9Quy@?+VPAud(+qRv6^70!@f$1VR>AfV($J7FKYmObB#R|JeLEbby|HQ1K|
z#@n7RuMY=%GTe6e`q(nj4!UlC*9|?Yr;Ww<z{Ay#wY$N<are8<zUxHyBIj=4tV@5m
zyMb$0dope%YfUXIW_Wrds*xTsz3}V+Vl~%gd=Tt!x}iIeu?%t13O+a4nhMTOOSG2S
zRccF1*w#^dM{P-|fo+?ajci~~wr*kn)@W}n?9`PS_FPK$ditr?Io$0UP8f}u$-dBN
z2)z+KsFj`yO&FDF>9x@z(bBq7ry2TNsnZ-?v(vux<FV7uwA#$}COg&4j!2qn9k1uR
z@i4^GKF^%!b|~fU#xm2Bp7jczw$%xSVOL)E=$ol09cSs|x8VhN(T3;Yhz(5&6BK4B
z9HlTzVGfSjaGb&ks!mdvqA(3d1kC1rWo%c%g_C$4$MII%P@r|ORG_6*#^<YyOQ?*i
zsEjI=5vDTQR7Rf4C{!7dD&tFGo&!Peh;bfk4rYP5wDb>%Ke13i3P4#kT5t->b}|57
zf|s!-;1zfk<2;rRC;tV7N7#^^yv9y`4Hj?|O<uuVz+7HB{Wla2m$p=E3rcWRJz*vp
zl`c;-dJh4MIJYFQLZ&6wG-jICS<`9WG-jG^plK_|L}#W=O=UX6nu?}rhc&&<n~J9C
zGc<jkW1{azn<kX$ENd#6rkkwE;Y}se<f3UW$3)+(Hq9v08?32pnj~v_lQ)%3lZU3;
zIVQS4+H_Qz-eOG^(==dBZ}X;#Y5EdPVUCIJvNp{s(>Ztto93~cy?0g9G-OTZ;a$8(
zH2JA}S2a!d(DY4?iGEkKX$~JH;62t<Gfm&JruTVM%`|<7rtfo1^c$y5$Cc>=_UtUv
z^aE?Uz@MFEntnvnPdO&~z15}@%CyXy>Za*u*7PB7s+*=?(DZALiT*>hX;PV1Sd(p<
zeq&7+d6R9Len-<EIVSo))21n9`iM0(Ow)bV^f7O0n5GA4dYEIP|5k09MpFSUskjQC
HsJ!+BH@S2z

diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml
index 01b556e..ef876cd 100644
--- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml
+++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml
@@ -18,11 +18,12 @@
         <result column="remarks" property="remarks"/>
         <result column="sort" property="sort"/>
         <result column="ext_info" property="extInfo" />
+        <result column="is_button" property="isButton" />
     </resultMap>
 
     <!-- TS_MENU table all fields -->
     <sql id="Base_Column_List">
-        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url
+        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button
     </sql>
 
     <!-- 用于按名称查询记录时的sql，添加前缀TS_MENU -->