From 103ff19650140080aee7e8f15c44f79d8f370ad9 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 15:07:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/sys/controller/UserEOController.java | 3 --- .../adc/da/sys/service/UserEOServiceImpl.java | 17 ++++++++--------- .../da/sys/controller/UserEOController.class | Bin 13041 -> 13041 bytes .../da/sys/service/UserEOServiceImpl.class | Bin 18531 -> 18719 bytes .../impl/BusProcessNewServiceImpl.class | Bin 6677 -> 6750 bytes 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 634da53..6de1ddd 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -112,10 +112,7 @@ public class UserEOController extends BaseController { if (userEOService.getUserByLoginName(eo.getAccount(), eo.getUsid()) != null) { return Result.error("用户名已存在!"); } - - userEOService.save(eo); - return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 4ec759d..32eaa3a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -76,7 +76,6 @@ public class UserEOServiceImpl implements IUserEoService { @Override @Transactional(rollbackFor = Exception.class) public void save(UserEO eo) { - // TODO 组织机构和角色 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (StringUtils.isEmpty(eo.getUsid())) { eo.setDelFlag(0); @@ -116,14 +115,14 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEODao.insert(userRoleEO); }); -// // 插入组织关联表 暂时用不上,页面不维护组织机构 -// eo.getOrgList().forEach(c -> { -// UserOrgEO userOrgEO = new UserOrgEO(); -// userOrgEO.setUserId(eo.getUsid()); -// userOrgEO.setOrgId(c.getOrgCode()); -// userOrgEODao.insert(userOrgEO); -// }); - + String[] split = eo.getOrgId().split(","); + // 插入组织关联表 暂时用不上,页面不维护组织机构 + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEODao.insert(userOrgEO); + } } /** diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index 0bd01484547012f6d0a674d9bbc0abb707f4a76f..ab709c7d84a30fdc8067bb69ceb0a84119b724ec 100644 GIT binary patch delta 351 zcmWO2NhpK?7{>AcCk}(8^d&`+WSf}CML8)~7sWwRa&RD%ELlc&rA*_qma>#&Nu$qX zCnw7oLP8vExy{MN!E=3oPjAorhU>%i{^v}i!+yy$4Tpz#dP!r{`ppVD#)-vCBC}R7 zdnsyxXcldEj>qU-C4x2KItgr$!6r`jaB)N-`xJ3NF^80DUd9&X_^Dx=24xzRX;#Lq zOsg_I*m&5Xp8#WWuY5v2DW8)sYreuRtFjH*mdqa~3U2W|x72Z`4i7Z(NDHsD@kBc>bn#{d^6t%dV))PlKDFVCRK9i9k3FBC qY?wZBu(V{FN>!_3ifU%;kSo$K`$PkxVbP#yNHk)FT%A^Jf$twl&uB&f delta 351 zcmWO2NhpMI9LDkQD-M>V^d?1-G`5(?ML8)~mnjaC(i|MfBot=IdXV+Cq(qc;!sNA+ za=(%;JN-jPyhe(`~A3o+<_;D(Plq8Oe5M$0zT3iw0^UK(Zj?sLJ~7p zFncj-o){KvPma&%S|Nfp;W~+Ikcpo>4sdcp5r-6WLL*OfO=&blxb4N zqfCo3UUu}MO%J;a$w%cA@=5uud`a_V_F0wrWm~d9yl_u=#wq8V*`0ZRM(Kt6T&m9% z$y}4l4H*Q<R65GDyQA(T)hg@hUmN)1gZf?`Ba2py@CU_o#Mu>yi#TM$JN z!M$*%!e7ue~ z-oml{$9C=}q8{>mh@R#t22Tx<@D!7$>36!xGfbWt;#oY~4pAds6rxnF(2ahI-omRwptdS?TZEW5=){L2KwyK) zcvOqWw0K;L-x&Nvhz9eNFh9vpX;H1s+q8IEi@0*zt{Uu!kdL1U@h;vS=GY#7*5K#D zG=`s#ke`1W<`?;Hov>Gnm$cXy;+J{9!LOM7YKX@3B31FV5WmiE7^QGZSXrGn##Y|zIP4&Lx^UmN#9d$f7G$>Yw;%(G5)~d4?{GM*Bboi5G~Mgf6?zp zTKv`IkM;YBj#y*zK}GG5$)B41nUbHI{DsMXGx_f(e`)epIt=!n#b2BJjmiJeG5^%Y zZ?#xq^1rm@JCncH`VS_@{;kB1CjX?mKChL-3c(SRkD7eUhJg~fY;MFvO- z!n{hQqDL~NsUgiwX|9dYkYq^E1A+KjJT-$lJdg2<@0A2o?W?U_WYTBn9A*(oLqa7*~Q*tgi{wPGX#*dHt4hJ zw~d4T>Nl;0{*VEi8qx+1#

2JvZZ5gO7gDff4%3wMgvt)=2wPctKx8w|M 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class index 71b4efb04faa10b0ac2c7899ceb8c4859387b934..34892b2de947b743cc7ed422194934add5b3ad59 100644 GIT binary patch delta 987 zcmYL{d2Ccw6vlsdy4=_IuJ(1hOdB;;6G-I`#-+7NO=xwhF+@QM#t;Gy?F+Qj8Ju}j ztblc2Dk^wIZ~;X`aAg@4MXeyND7fK*3X0+`?khs$y^Yb_obP<+=G=3>lY17`@2>CL zI=FEFsAtfnft;krB|^?&w!=l1_BvebFvm41b4v`&^SFdQk3+ara+&p)Te!lbiYue0 zRKLsh%#R{iVA(>Co6(Y6?Bhj}TRo~-Y+;FkK5n!0c85D$?qsP=TIO*VcRMV1xW{3I z!@c%)rN@2tc9mqcX`|FoY>Yn-Y~_vJf&#lB+1i?XBbdC%O=6mS`-~I<(yoQ=~ZlIlTCb1v4!Ua z{;BD7m^GbeofU*L(jD2-VqWlh(YTj6ZLu zi|tojKuRx(Hi!fH?a{+T;X%PL-BKRYg%vAAtzKO*t@3yrPN2+Gtuae`6epUmZ`4Ot z?kH(7(P=bux;{`jUyRX%RSCVV>R2((uux1i7}Nc+F=EmX+ZT(80$o(Sr6Hh%>BN{p zEnSQ>f*OsER#KeJEGBay0afxN`@x>!I<@Zsxtp#I+P~ VwXtismg|Pt4cy30|FSi#{RhH@@XP=J delta 991 zcmYL|X>3$g6vuyeioI{%ySCG5>9moA`T=cgbWmHdVA7_gA2etU1rrU5)0qdf({^y? zwG{;h_YDQT)?F4i+%1kPDyUUd+!fqG5piE|---7&Bg`*`;D4ygg#YQ&i zW$wZGr`cqWpHV!^s36js$ppC|n^<_fA1uhEa;3#Q7vXsWnbWqQ@qX_iZ^*n^0s0t+XN*&iNQpCAn5Lm&*;ttig$QdFg2O!iziaacq$PeO3&-n z&EYaV#hXz79;YZyvuZAtQd|@(DW?pR!BQ z%x8kK|4Yuw`hKS$n6`IE=#zY|_<}EO+*gvX72mK+(5@$kYjh?wsjyVZQ2n=jC#a~c zn=zKAH_<;o-qF?LCxdBrYrYp0&G!Sr#M(N&r?f(kmaH!NfjtGkbR;Bx)Rob7RX-_y z=66L8X~`e9+MkME`t-JFqxievl^-C+{Uey96Xh}8TwbC(Du%^Gy}P1o{NXqpK^aF< zZHgUembjLq^qlcq!!5>YrNwmHRJmLnr$=Hjy}j~O(Xo#ms`IhQVwSPG#K~j6`l^@+ z>DH>z#w1~UV$7q41sq1VS%Ng}rl%9=XAT*2dImZ3EoQ)M`H)%8MS5!W^x}wXr_d{_ zKU4oWb9WxQ742 fU;Jw3Jm1(g6mfx(3%Q7k$JlZ%=ZbyoejfM_JfZL)