From 9be65d38977ef57186d138bbf438a1a9fedf0bef Mon Sep 17 00:00:00 2001 From: fumeiai Date: Mon, 18 May 2020 11:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=92=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 15 ++++++++++-- .../lz/modules/app/Dto/DepartmentsDto.java | 9 +++++++ .../app/controller/DepartmentsController.java | 2 +- .../lz/modules/app/dao/DepartmentsDao.java | 3 +++ .../app/service/DepartmentsService.java | 2 ++ .../service/impl/DepartmentsServiceImpl.java | 23 ++++++++++++++++++ .../lz/modules/sys/oauth2/OAuth2Filter.java | 3 ++- .../mapper/generator/DepartmentsDao.xml | 9 +++++-- .../lz/modules/app/Dto/DepartmentsDto.class | Bin 3194 -> 4447 bytes .../controller/DepartmentsController.class | Bin 2993 -> 2827 bytes .../lz/modules/app/dao/DepartmentsDao.class | Bin 978 -> 1180 bytes .../app/service/DepartmentsService.class | Bin 724 -> 843 bytes .../service/impl/DepartmentsServiceImpl.class | Bin 5328 -> 6375 bytes .../lz/modules/sys/oauth2/OAuth2Filter.class | Bin 3898 -> 3694 bytes .../mapper/generator/DepartmentsDao.xml | 9 +++++-- 15 files changed, 67 insertions(+), 8 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 704f7419..335c6a88 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,19 @@ + + + + + - + + + + + + + diff --git a/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java b/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java index 6ee4bc36..da2f7ab3 100644 --- a/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java +++ b/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java @@ -1,8 +1,10 @@ package com.lz.modules.app.Dto; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * 部门表 @@ -31,6 +33,13 @@ public class DepartmentsDto implements Serializable { * 组织架构名称/部门名称 */ private String departmentName; + /** + * ztree属性 + */ + @TableField(exist=false) + private Boolean open; + @TableField(exist=false) + private List list; } diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index 1908e7fd..7369874e 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -39,7 +39,7 @@ public class DepartmentsController { @RequestMapping("/list") // @RequiresPermissions("staff:structure:list") public List list() { - List departmentList = BeanConversionUtils.listCopyToAnotherList(DepartmentsDto.class, departmentsService.list()); + List departmentList = departmentsService.getDepartmentTree(); return departmentList; } diff --git a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java index 717f25f7..72b02008 100644 --- a/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java +++ b/src/main/java/com/lz/modules/app/dao/DepartmentsDao.java @@ -1,5 +1,6 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.DepartmentsDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -25,5 +26,7 @@ public interface DepartmentsDao extends BaseMapper { int addDepartmentBatch(@Param("departments") List departments); + List getDepartmentsByparentId(@Param("parentId") String parentId); + } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsService.java b/src/main/java/com/lz/modules/app/service/DepartmentsService.java index d6df7b5f..33f46db6 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsService.java @@ -2,6 +2,7 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.DepartmentsDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.job.model.responseBo.DepartmentInfosBo; @@ -23,6 +24,7 @@ public interface DepartmentsService extends IService { void updateDepartmentInfos(List departmentInfosBos); + List getDepartmentTree(); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java index 7f7decfc..d73dd38e 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java @@ -4,16 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; +import com.lz.common.utils.Constant; import com.lz.common.utils.PageUtils; import com.lz.common.utils.Query; +import com.lz.modules.app.Dto.DepartmentsDto; import com.lz.modules.app.dao.DepartmentsDao; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.job.model.responseBo.DepartmentInfosBo; +import com.lz.modules.sys.entity.SysMenuEntity; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -50,6 +54,25 @@ public class DepartmentsServiceImpl extends ServiceImpl getDepartmentTree() { + List departmentsParentsList = departmentsDao.getDepartmentsByparentId("0"); + getDepartmentTreeList(departmentsParentsList); + return departmentsParentsList; + } + + private List getDepartmentTreeList(List departmentList) { + List DepartmentsList = Lists.newArrayList(); + for (DepartmentsDto departmentsDto : departmentList) { + List departmentsChirdList = departmentsDao.getDepartmentsByparentId(departmentsDto.getDepartmentId()); + if (departmentsChirdList.size() > 0) { + departmentsDto.setList(getDepartmentTreeList(departmentsChirdList)); + } + DepartmentsList.add(departmentsDto); + } + return DepartmentsList; + } + // @Override public List filterUpdateDepartmentInfos(List departmentInfosBos) { List departmentsBos = Lists.newArrayList(); diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java index c5297787..70dd6c00 100644 --- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java +++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java @@ -67,8 +67,9 @@ public class OAuth2Filter extends AuthenticatingFilter { return false; } -// return true; return executeLogin(request, response); + // return true; + } @Override diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml index 701b5b26..7c3c497d 100644 --- a/src/main/resources/mapper/generator/DepartmentsDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsDao.xml @@ -3,7 +3,7 @@ - + @@ -23,6 +23,10 @@ select * from lz_departments where is_delete=0 and department_id = #{departmentId} + + UPDATE lz_departments @@ -57,7 +61,8 @@ - INSERT INTO lz_departments(department_id,department_parent_id,member_count,department_name,chat_id,leader_employee_id,leader_open_id,status) + INSERT INTO + lz_departments(department_id,department_parent_id,member_count,department_name,chat_id,leader_employee_id,leader_open_id,status) VALUES (#{department.departmentId},#{department.departmentParentId},#{department.memberCount},#{department.departmentName},#{department.chatId},#{department.leaderEmployeeId},#{department.leaderOpenId},#{department.status}) diff --git a/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class b/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class index e974d967a8de216c9b8edb8b1ab456b3a0105271..cedd07417048319f40386c9f4bb979cce0ddf4eb 100644 GIT binary patch literal 4447 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 diff --git a/target/classes/com/lz/modules/app/controller/DepartmentsController.class b/target/classes/com/lz/modules/app/controller/DepartmentsController.class index acdc117f812fb2a7d5c461e18dd9607b719c15a3..76023ad53984e38d16d0577ce52dfc6688350b0f 100644 GIT binary patch delta 1024 zcmbV~*-{fh6o&uqkPJ+kL8BHD?}<+Ud)`O&pG|gf2KY5F}3{b&-WhyuHuc01Qv%djC*mEP}Z;e z4whUjV`UIIZC7=2O}{EGs(7HihYr>qJZi6(qUli_R!HKIgU1R_Frl!4rvio6Z&{dh zP*d2%mclb^D@>uT@EmmqFBD$lmBMQ@1g2YAIoetgnN}lK_D0_N&65A2vD19#zi)2r z`2OdtQxU;1Spfm5Z=)Sy6r=U5B?zMZ8ZN4qD@C4Ws86e#^|fC0BIa$BruK% zL`-vyk<=CWFOVHX1S*A3jDv_7;+n%eTolcqR9I{W>C*S2c4@r*Wmh delta 1136 zcmbW0+fx!@7{;G(5muKCa!oWk(ScH+urxbhsbFaeW#uX9v=$)^1C2}0bVc`FHU0(t z2Qf9JT{KRd)?uzKxO&9PU=6#><_dOqc2sL_UfB*UM6TlEk8V+JY#jOqmaodkc zOli1-X_?Ka$ZE*pZad;K-jmH)`E_5z13Z-3oQioB3yrA>udf>+f#^rGYa^i;VI7?? zR4nQ^ieoC4bUebcjyxW3eDV%NpXhjsXF8t4)Nv6jI$mH!#Y-IpywXv`s=%Ps>hKjr zf=TghtyH#>>4I6wR4eO+HLFyu%*&oYce!NMGSxTl=BneBYHhW!mSuwiec9LMx|uAS zm0~heHZ3dVG^AEi&ZPSHHom;~Wko$mTL1w?-h#130p1X zY`AJcR>yIIsu6C;lbp^;W~bOuaN33sus*|2G!J3nEVFayLz_*p%#%Ev?UfAiE%=l= zenHJ`qTT37e1j%ooNGBS!wBGt4HIz|T^LHBA2Estpdn6R1?Rcz6>MW4jtjJp)Y8EL z31@Lm@aIs!;f;NWO#)!KZVXE%fG01T*XkmiF3_%sDYfXqyX-Q^|zE5Uxi8Uhw2SSH0HXW1KF{+5V zl;rCpSp(!++gWdZ<|g$U51bIoF$okwKI}jDeYf4d_Z%Mh0;pB@Dz&3=#|+K$?e< gfsug|h`EY^a?DUUNd_sf8fgX@Ak7ApmStc703Ka8jQ{`u delta 70 zcmbQkd5K;4)W2Q(7#J8#7-ZQQq}Umx*%@Ru3g2Vg+{YBk$jCDJ33IL-12cm#Pze)* UD1#W77H5zE(rgTj43Z2C068QJV*mgE diff --git a/target/classes/com/lz/modules/app/service/DepartmentsService.class b/target/classes/com/lz/modules/app/service/DepartmentsService.class index f7756f95d710eda01589135bcd66efc8ae80431a..0522b6048d8d3bfb086c836ffed70c60ce228865 100644 GIT binary patch delta 149 zcmcb@dYVo6)W2Q(7#J8#7{u8bMA#Wb*%`z(3WqT22&Si&xTF>&7M0|t=9PpLrKU16 z2x(~gWF?j*>X(*e=IHxm7MEBvGFWS9PL^U+kW4Hn(03`x*GFh726CK@7bs_cu delta 58 zcmX@jc7;{=)W2Q(7#J8#7)00^1lbvc*cpU33WqRmKF6rS$jCJLGn1JR0}}%WPze(Q K9|J#_761UDUkYCU diff --git a/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class index 10751adf3c9e1363d8f9f3e5fe8328ca432a34fb..7db279ae47634f0b179f5006b256379e9396c710 100644 GIT binary patch delta 2498 zcmZ`*30PEB6#m~ZGjE)EvL}q9pn$B3rl>%Q0xl4spoW&3D5GMC#*C&}jg_|8s;_;~ z%t|XO4Fl0K+pMh2EVF$tE7P#7%u@T$dpO{S0dwzv&vNg%|2g*zdr}Vc_3t{lbvuCm zIO#+Vma16hgau1wxK73OPS|9Tg&S1d=!65yJ8*H63pe8y5#Q>~3Kc6wr>nTb zi7+g6;7*zElHqO{?s4H>+~>gk;{Aa5Jm~ae6;{h054o@g56iGt#UoC{;!znM6Wux$ z>&5(WC*tvhct0t_1{F^^ku32g<7v@7BWR6|nM-sjQ>1S2PN;xL<<1z&AIebssO6IYa1` zldSvgiM{?udrrH&>oEeZM0zs1!T(!;T(<^YOZd zTntt5hK4t>OG6!IF>VcS$>MFiqaeb_Q%z;<%#7g+r+eo4s^`{f7>pr$Nr%BhcjH|R zyRk>Zd)TYueGMOAp8}dkrK#lno=YbI#-J;LJ309L`k+XN9vZwGqlD0t-fP6l0(>Msn0l1B^l; zR|<-7K7ue@KN8y4FSg;Za*Rg@Bp`xw6p{?TI9dU5Eq;QEQ9}PHT9#roPZ~pgC(fp> zETAi=Y%HZVb^}i1__1I-)fb>bj^=tF=OE~7!bTf0^x(CC-f;3lq38oQ&Sgs*fF5kO z@yH|@1C5wc8EYs)FaZ;}WjwmzLR@4-kQ<0I7n7(}0@0cFlUuANVG4B@^E3y7V)In^ zr*=6V>?BIfU@K`e4b$l(!A|2Ww~S2P3}<+B6WkUQr=~Tcb4A)l%7YBfgE@mK)R@9> zCQ!IH*@S)!jYZZly58ymW1tP_p6<3bp@#((>rQP?m$0oy z*nX4yVO-{s^L%EYfZrg)IgVt$N0G-u<1YRA1($(tsOAl9wCs)9xWuTP@&Nbcs4?zm zWrfTkGHXOC$@KKllh>h@T-mVl6IzUfL?P$|_~dF;%sqiYD&`R%gX?s9YUpaRbSa(L zt6Er!q`ykt#Ivw8;xtR~WJxGW$hMtkE3pYZE%0aC-S(XbH>Bh(Nf?5bE*zR{HMU`^ zCyO7voRtqCmeeGnjHOx5l#k`J8qfGD_&dQMYzT9ggkJE%$7>HnSIj4}(=QVXaG62f zMEK2j$?#k1*2-Ajz znJ;n*q8U*frt%+yO1|G|7{u2zl%+k2>6MpYc9Wt&r4$(yDD=-W2nvL|fW~DGTp4I_ t-5Is~bO_Jdg6w*PN}E&Kw7D2w!>o&|;HS=lB}T_|(due`uJPj9{{VbB@#z2n delta 1530 zcmYjQS#(oX6x}b=O<%4iw5+CSlcuzVLR*AVuuv#16%k4YQD}`bPAK9~alkR)fb)2r zP*HHIRn%f2Z2)mb#R)}l0Ed40>stP}TuX4Dml(}(&%S54Z@+!c{jFi&q~zWsJ9Yz@ zj!_#k(64Zn4Hx=lS*>uj4XRd1h5`=+PDjMOVvFA+>7LWvfi)ofSmE5jVK%7 zx0N) z-9pUtxMI~BEqFs?7Mc~_)EL56jWcnU!l1@mvPof^2?k1hO_*sRY~sPNnIEW{vK?uS z?HJY=K}KPR#!l=~cw1vP-qCm$?~#kf`}jcPLwsZo1)57Q#w8kikkR-UpJ;rFy&9k4 za|?B5ov+BW=+Z@BV3)?1lJb?HefV1A8|>HkR(uD<%T+^2G0mYa{tQi4kt{o@PT9}U$;b!itqK0G}J%#XajiUe+D54Fc%Bibh z7U;{?30i=YSRZEQLM$Sy4#taVv$4hbSSNj5^m;9p0Nwn%(8KV_SR#++{s65TCOWpq z;ZVtI0Mx=p9YUx_1jmudG!E8OvT5MkH9DMX$u)!^PQj@>vI=Ebie(Oi);!Nv^fGGY z*=6(la#_7Njj;ru=7&4p&Kq`m*}r6a>CKWogE^eBELm$TYZYUO5tMY*We~B@JvoC? z3mdS2pv>YlMVmdf5l}{;E{U8j9x9gA&*@*%5k`U{Og1QDi9|7Y{zgFIe1!{+pjF{Qg^T$66aK%L zlI!t*vaR3=yh02~kGIgu2zBg4WnvgrUG;U;B#mmZF|M*@rW?T$csy32X2A1kvr xhIkxF%cr2Qaby;zrx4o8o#l{_I|e@5otukGv5I>aE^}^RfYHnOzhX76{0Hyz_wE1y diff --git a/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class b/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class index 94e5604ea6f4eb7c83a3d0312aab60f471b9c2c4..3632a31756bb1b9b9a89658e9f66d0b7a903fa53 100644 GIT binary patch delta 1354 zcmaKr+jCP@6vlu1Bq#giS+N37OH7z6s^>Fx7LDMX>H|ZwS+cJFVNIB#e&*+ zzboQVw5ZR0kOvuNN{cfNFOH6XgZ>LX=quy6_Gu^ZWM;C?+Oxm4zO}x!_SJ2FZK?kL z@714yd-={~JH49cT+;Np^z*#tpo`6+1Qv(m9O0-d<^`7lUevtgFqk00F^7V~apMj- z47(H=aVasX8FLwD!sP@fHIpv&^cqt(*eREnncl3KamX2liZQdAQ<_&UeLt;|a|*X} zZm2j_87oiDXif)d>z|-M^0yNmpD9l&vcZ6A4Q8WlK{Aq$OGTP9k}tR%{UNf0+k=9g zNj%LnnpZturMY+#>we9C8vhVpbNSC}dcjTUpGmC96ZpP0T%p)xCVp7A(qz@K}Z;|s+t zL*dzT&**YmaZ3S8NyjL%(^>s7FN=JFJQk<;xpPniPe>f9C)*TAE;=crE-Oir0Ow;^gC`1dfO>)Y~ zSIO7TTtQtD$71Ii2pRh>@x4_5&DW5AhRKRvG}cH`4TXcQ zkTkt|T_ZI`uXby#k^WCt5Au-d3RJVCi3`JsAH7B*Z~J!2TVb7rICZJ@D{P1uH@Qrz z8XmGsZ2T3SU6jAL`B+k&^J7bFT4r-z|3v+fE8ObqCH%bO+bc9Ed}oQqMeKYma#7l9 zW{~4-5n>}~tGqktM)NEiI3QE&5k#NJ)lVk}#XBVUqY_a)%&6dnoXic0h#Pl~v9xEx8M*V&`l z*P+=zp?OMCHOrBVN-`u3wb5C~gI<-B8Tp!|jV-CID{Qmq&Mp&Ozzff}ne&fwz1n&z uT-aghr6jG7%8pFjG}@aNxm(0hyKDPv-Pm8>?5`=zRwAMdR3tR}((@mRnZUIG delta 1576 zcmaJ>TXR!Y7+pK(vXj%(+C)n^4V0ALBu!ge5!wi9s1?!DB9~$n#TwF@v?jF)r6?M~ zdRMd_QSkygKJN42)F3ho=H~8pkXS&scaC$K`yYW=LY( zLQqA$;78g*1`}#OS%C_?Xd#Q7N;c)kOX_6WLLLPRCov;&%8xFUcUBFjC0>?za z*_7L4#TJWjZ3&}<6B%-T<49*PjzxZxWD<+?xn!b4R&fal{{HU4dlp7 zpemm#D9)*D;qd9Hlt72OMQe7aw1ArlY2E7mRM-&Dz=Q!tRx=_*go=xL=iyQu5Jo#Xyj)?H zy@!-C*-eWzUCDb)uY#BqPAz6Me26|B_C1>;`PUD&NU=K6QeCg+1-PEF%;Y^P#&|P_u*$al_G9Q7hmWOW3F_ zM%!Xba2AZ{70`l6LQ6~i&7sH@Hm#|YJ}BJ5*B>k=6260p5Z zzd*(o_~$ZiQVhpj!e;6bmnDH5sig5c#+o#KO0xhXZfc8kLo1HsdDNE#>fkp97=SEN zi)swgUPFW&q(cs&A4fP2Ghl=vM{$B*GG&QleS_Nn$j58mSi5jZ_A;hAAE%2mUVD+X9OVX-BnQ~Q ZzxT|ye$O2Brq%5-1VJF^364G-{0A6$=6e7D diff --git a/target/classes/mapper/generator/DepartmentsDao.xml b/target/classes/mapper/generator/DepartmentsDao.xml index 701b5b26..7c3c497d 100644 --- a/target/classes/mapper/generator/DepartmentsDao.xml +++ b/target/classes/mapper/generator/DepartmentsDao.xml @@ -3,7 +3,7 @@ - + @@ -23,6 +23,10 @@ select * from lz_departments where is_delete=0 and department_id = #{departmentId} + + UPDATE lz_departments @@ -57,7 +61,8 @@ - INSERT INTO lz_departments(department_id,department_parent_id,member_count,department_name,chat_id,leader_employee_id,leader_open_id,status) + INSERT INTO + lz_departments(department_id,department_parent_id,member_count,department_name,chat_id,leader_employee_id,leader_open_id,status) VALUES (#{department.departmentId},#{department.departmentParentId},#{department.memberCount},#{department.departmentName},#{department.chatId},#{department.leaderEmployeeId},#{department.leaderOpenId},#{department.status})