From 8df19abcef713459a2bd6be30ff5a8123e11300a Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 9 May 2023 11:00:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=88=A0=E9=99=A4id=20=E7=94=A8org=5Fcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/report/eo/TtReportManageAct.java | 3 ++ .../mapper/mysql/TtReportManageActMapper.xml | 2 +- .../adc/da/report/eo/TtReportManageAct.class | Bin 11428 -> 12215 bytes .../mapper/mysql/TtReportManageActMapper.xml | 2 +- .../da/sys/controller/OrgEOController.java | 2 +- .../com/adc/da/sys/dao/mysql/OrgEODao.java | 2 ++ .../java/com/adc/da/sys/entity/OrgEO.java | 13 ++++---- .../java/com/adc/da/sys/page/OrgEOPage.java | 8 +++-- .../com/adc/da/sys/service/OrgEOService.java | 29 +++++++++++++++++- .../mybatis/mapper/sys/mysql/OrgEOMapper.xml | 19 +++++++++--- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 22 ++++++------- .../da/sys/controller/OrgEOController.class | Bin 5365 -> 5301 bytes .../com/adc/da/sys/dao/mysql/OrgEODao.class | Bin 1045 -> 1137 bytes .../classes/com/adc/da/sys/entity/OrgEO.class | Bin 6366 -> 6259 bytes .../com/adc/da/sys/page/OrgEOPage.class | Bin 5841 -> 5855 bytes .../com/adc/da/sys/service/OrgEOService.class | Bin 4052 -> 5183 bytes .../mybatis/mapper/sys/mysql/OrgEOMapper.xml | 19 +++++++++--- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 22 ++++++------- .../define/ActivitDefineController.java | 6 ++-- .../define/ActivitDefineController.class | Bin 14021 -> 13864 bytes 20 files changed, 103 insertions(+), 46 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index 7e1c069..81fa43e 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -124,4 +124,7 @@ public class TtReportManageAct { @TableField(exist = false) private List labelList; + + @TableField(exist = false) + private List labelEOList; } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index cda62e6..1c00fab 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -22,7 +22,7 @@ - + diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class b/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class index 27e69c52815371fb9d242dc22ab727490bcf733e..a65f6986478c8e1c70fd0db80fb71250fb6a907e 100644 GIT binary patch literal 12215 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 Rvz5Q<{TJ>R{tWxy{|7SGQM~{F diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml index cda62e6..1c00fab 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -22,7 +22,7 @@ - + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java index 4dd5a3b..d47f96b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java @@ -100,7 +100,7 @@ public class OrgEOController extends BaseController { String currentDateTimeString = dateTime.format(formatter); orgEO.setUpdateTime(currentDateTimeString); orgEO.setStatus(1); - return Result.success(orgEOService.saveOrUpdate(orgEO)); + return orgEOService.saveOrUpdateSingleton(orgEO); } /** diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/OrgEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/OrgEODao.java index b36339d..b990fc8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/OrgEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/OrgEODao.java @@ -15,4 +15,6 @@ public interface OrgEODao extends BaseMapper { List selectListByVO(@Param("pageVO")OrgEO orgEO); IPage selectPageByVO(Page page,@Param("pageVO")OrgEOPage orgEOPage); + + long selectCountByUUID(@Param("pageVO")OrgEO orgEO); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java index 555ae0e..8b10746 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java @@ -1,9 +1,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -18,15 +16,18 @@ public class OrgEO extends BaseEntity implements Serializable { private static final long serialVersionUID = -2386892031753294731L; - @TableId(value = "ID",type = IdType.UUID) - private String id; - /** * 部门编码 */ - @TableField("ORG_CODE") + @TableField("org_code") private String orgCode; + /** + * 唯一值 + */ + @TableField("UUID") + private String UUID; + /** * 部门名称 */ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java index 4209f2c..1ad5f27 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java @@ -9,14 +9,16 @@ import java.util.Date; public class OrgEOPage extends BasePage { private static final long serialVersionUID = -2386892031753294731L; - - private String id; - /** * 部门编码 */ private String orgCode; + /** + * 唯一值 + */ + private String UUID; + /** * 部门名称 */ diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index 3e282f3..6d5291d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -5,6 +5,9 @@ import com.adc.da.sys.dao.mysql.UserOrgEODao; import com.adc.da.sys.entity.OrgEO; import com.adc.da.sys.page.OrgEOPage; import com.adc.da.sys.service.iservice.IOrgEoService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.adc.da.util.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.UUID; @Service("orgEOService") @Transactional @@ -33,7 +37,7 @@ public class OrgEOService extends ServiceImpl implements IOrgEo OrgEO orgEO = new OrgEO(); orgEO.setStatus(-1); QueryWrapper orgEOQueryWrapper = new QueryWrapper<>(); - orgEOQueryWrapper.in("ID",idArray); + orgEOQueryWrapper.in("org_code",idArray); baseMapper.update(orgEO,orgEOQueryWrapper); } @@ -49,4 +53,27 @@ public class OrgEOService extends ServiceImpl implements IOrgEo IPage orgEOIPage = baseMapper.selectPageByVO(page,orgEOPage); return orgEOIPage; } + + /** + * 新增或修改 部门编码不能重复 + * @param orgEO + * @return + */ + public ResponseMessage saveOrUpdateSingleton(OrgEO orgEO) { + if (StringUtils.isEmpty(orgEO.getOrgCode())){ + return Result.error("部门编码不能为空"); + } + long count = baseMapper.selectCountByUUID(orgEO); + if(count>0){ + return Result.error("部门编码重复"); + } + if(StringUtils.isBlank(orgEO.getUUID())){ + String uuid = UUID.randomUUID().toString().replace("-", ""); + orgEO.setUUID(uuid); + baseMapper.insert(orgEO); + }else{ + baseMapper.updateById(orgEO); + } + return Result.success(); + } } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml index 9751bb0..c1c56ea 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml @@ -4,11 +4,11 @@ - - and id = #{pageVO.id} + + and org_code = #{pageVO.orgCode} - - and ORG_CODE = #{pageVO.orgCode} + + and UUID = #{pageVO.UUID} and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%') @@ -45,4 +45,15 @@ + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index a136665..924b657 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -58,7 +58,7 @@ - + @@ -103,13 +103,13 @@ r.is_default as isDefault, r.name as name, r.remarks as remarks, - org.id as orgId, + org.org_code as orgId, org.org_name from TS_USER u left join TR_USER_ROLE ur on u.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_org uo on u.usid = uo.user_id - left join TS_org org on uo.org_id = org.id and org.status = 1 + left join TS_org org on uo.org_id = org.org_code and org.status = 1 where u.usid = #{id} @@ -160,7 +160,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -169,7 +169,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.del_flag != 1 and users.usid in @@ -186,7 +186,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -195,7 +195,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.del_flag != 1 and users.usid=#{usid} @@ -209,7 +209,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -218,7 +218,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.usid=#{usid} @@ -233,7 +233,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -242,7 +242,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.usid in #{id} diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/OrgEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/OrgEOController.class index db88ce042de256938b43f10c3c088550fb8f1aa9..d20c041e95f8d45b23a4f5d8f069bc79da6902c7 100644 GIT binary patch delta 1508 zcmaKsTX$1M6vuy)G(E{-l(sHuNi8i@C23Iv>jgz^MFG(Yf?Na@imixZDWu{BFo+JDJ^S*Xz5o0CmA#P7|N76R zUw{sN_Gw~UiZt7Oat!)B#||ew@9~0Dzv%Ij&rWtZ`n5j&p!71 zyv6~yyzW!Y8$Jhl(@AeRze8>ra!!Yxbfm`PZJ&1tT!y0_?~WXuUTuzzj#c-@TdrlM zrG@Dp?^)jG1CI|aAMvr}E{+=-gJsFagym|k3D){eSA1gml+P>=@VUn^%NKkZ9Q2!# zU(snf!PmiAzhVA2mXmzz@tx%qr!8mr-g1^ReTWj(_#-$lzfKNzyX zag)8wbhra*BPs6V_pJ%;ydnd4|b`J0%%)uT!8i!5=m4WtbKz%i=Oj z=^~~yUED1{D|8FEr-Y!Zh~VBz1PfVIM6j6qWSGKC(Y8c?2dKs<&XOx7-R}%@%3(yE z2-)e{4t4JL+WNdJYE+}vBA!;dLp+YN53*EoN;PttWzsw(KXvbK8a$RyRIFRdsA4Pr z5AVYzymKl6m+*EA?@Crt6>?)pITO0f1Sjiedc%@pBJ6K<&EX3=qPyY?GOSh|jk+*{ zH9R6)Uj$mqIZ#qc#;J12(I$6n@^M$xSY=rHwL(2xG;s)rMfubsq;SNCrv>(mT%Pq|%*1ne z-o#NHlg|q#ym-;XOL$qNSHy1I!~|Xy={2!@eTj%^1IJCgffEwuO#^RDPtC^`XrJv5{D0 zFgCm=($zcA-*=!j+@nxl(6%L*S!`ILBGeOhptJf`g-|Gcx+I+bvvfQaWN!gCsw5C4 zmsAuA^_0Clud;NkVUfY8!x+XyQ$wnMNL{ zaN1i|of5Fg*uX0I(PA0YkQGpxH4y1qTt`Dc&927{L`V5w+}fHOskw<7k0KDbnXe1C zScxp9w2Hu%BwBH+2s@#YxDB@xWGF0FxPy}7;H)O;a5_`g=-{-0QQ94xs`8ww(1ta% z(`2_6>k16o@(k7&GuS|1IR+bX7lD4L3LcyI3ZXJZKbw|N+AP2%V<=9i&1`>p)M6Gu z2?1MayA1)(QYE%K7}n<*)}zy6=x2w!a5p^{swSFysM$hK?C0O8G;nXOhMiQ}HQZX1 z!A3Y!*!KS^6f)>!2Hm)ioMl>$Gp2`Ub9y+i;<8yRokhtM?=Cc?Cj-?f8JDPy$mh|_ z{MONnmov8mJ;a)v&7HWPQ&Ns)*u^YMa@@Dmfef&t?+-Zo{$Q@}xwh|SaorZRwRD`4 zIn)hj;c7gO%2`~I{N3VlNAM=T`Djq9z zFMU}PpUQ@=>R6dAj2ndoImnhDakrm zP?*>t&*(LI71Iw!=E;kh6UE?fJU$~GOz4@3eRMk{Fvz*Bh%zt%n3paObi@A6-*4m J3?g7!6acms3ylB( diff --git a/adc-da-sys/target/classes/com/adc/da/sys/entity/OrgEO.class b/adc-da-sys/target/classes/com/adc/da/sys/entity/OrgEO.class index 3140c07c6adab3cba6dc8ef4a5c5f7223d9d420f..68943554c8de2b3bdfcdfae13fa87a55d7e9a451 100644 GIT binary patch literal 6259 zcmcInX>=P`6~52bGLlBNEL(P_iHp;?5HG1{Nl80S+S-njI(UmEyEH7WY)@?^vgB$B zP0QW_DQj2@0m|M$33Q=x=t60MroeB0!8x4rkHa5+bD)Ip&U+(`rAgyIoMYd)@7?da zGxxrG?~MNV-{)T^3w+(s=%Ply)aW^0 zJ+ILV8oj8|uQYl|qhD+EvPQ44{s0EEHEp3(Jnwu zHETXw$}Z-t;e5VO&XnP~BF)-Su?i`LeZQ72z+$ z*om?Eu?a!pQe}PG2}V!N%`C8SbowA1>F}OfEfmZ07AX`htqQ@+`O{BoGDvrqze4G znS;aWv4!+F2NBqx&1cKE32NTmH!sL1v)ww8&0ABIwMDCFXNdD(Si-?&aD2#^+VquI zv$#*Uo$Ac;QgS(yES)MPEu2dER1)!yO(PHC6{}p0y<>NuD_PZ}3<4u_tlOaT-gejT+g1^-T3I7wb-OpUM(!o zWQwSfGKw3=0iKFSdQkDmg^H)s?av8^9Yz7$6p*C31H#VcfUr>wi0Mv1(A@zAtotgN z9G-AfFw=|2t)=o%-!U{~VRN@B6WXItUbTuSS3dP#)U2$PsJ&fVhitQoUE1WL%9E+6 z@zmOJtCG`F^{X~oZGgLvViMxsYID4}auu(7a&5+J;HJ)MlekTL5gX<-nJy8|QW~9h zQ$}amYBSxPryke66~!?votVt5+Z}}w9i&$=S(Y;SF+L`!tC`ZOOf))l9H%fdYd5Zd z9w=I+O0Eo4E&cvpnQePZW;VoDmBdJ|J6lnqHvtb;64Dx}RSw7i0^g z%Tt9)aS6jThanS2zmHAdz%yG=a_gg*9~cuOkWTS@)M=cK=yW69q|-hYx3Dm2NT&m= z-Ogf|#VCt0HXNp#1a0Tpe}#dh(xuBKE>Q z8yoq1^!{K^?T7$rwIS6*!cNOzkL#GQ5gP1~2PJiRRM6q7c34=8KApZwM+NP4@x|rm+&-36Pt~&r;JuEjGCIeD++0uY z_9Ua@JjlL!@-9y@I@N>huP66;lF{KF@XfJ^8RF8I#Y09H}QydXnEu??e4^g_*cE;Tq^4xIj(b_1P&Asy?}P zWoy45Jiovqh9_C@cGwq4>2MHW$W2d-Th*=Gj&A1A->{J<-u zpCy0u`GJ>7pB(Jpps2ls(lRv&VfyyGMiIkziQ3MQzQ^!wP^*K8nSMZGX29?>CUA-3 z=O}9UjerZ(W(EOjGc_Z~AWeaShUNmr%@9CwGi-zy6jq>+5q5#v%?Lp4rfx(Sq$?0K z7pTLG0@Pu)7*PhbC{WaBae)$MD?kY|X0$RWra-Mm%mwN++W_h`<3<~U;tJGe#9g2+ zvmKx=v%_d-P=^Aw8yzmtHZuXxHnY=6FsM_35=N&3@}0+IYNq=4?BC^CIde>$p%awD z=t_tOX$|k*Ch8SA%44sY`o+CefaasaVw~2Y`Ds#&(tXeZloP#FgchWtxRy%LH2NZ4 zrZTh;Jxc$g3bZh7(4Xlfv!gn({`+ZX zQ2P(H1nHqSs53|p<4+TB&^D=t{%dQbC>W5H8q@&eAD=y z6GG0{5RY&?uG#H}&wXs+<>lk{i=zGFv7!CG19p?`hz+fx#kAPKISTICAmbk1kC{F; z7(QjuxbdW^&Gg$Q^qfu748LQFn*rMtsG87;lGSboZ4;VMv4W1N!_;h(RyCnDB`aZu zY!kXtu|kfi(+u0DaMgrfm8>o^Vw=#WiWPB8+f3ay=~a_%n|63Nz{4_ID!t93l}^(m z$faLIQFf0Yn_;2RXOQw{+C~4Q&qDLjZ7AK(LG$Bx*K_oFXaN-ZWAp`RLCA+tyxag! z&?=gM8{k!ZbbJX~m|n*x@|U4S=-+6*uRzneIGc`9$7O8zP@F=bAW4YJxM^+O#2X3n zI{*jc+q|V<0T-->tlw4O;AU_Q?_p3Bt$|WwdD|2*Q$8-zxPk=Dtnp m+jxIB#0K@%f1bO40G?KT*+gHnhvTEw-_Bo04EXK*jsF2Nrif$! literal 6366 zcmcInX>=P`6~1F@8A&5cmMuHeBqd2*aJ)pcgr$?DtsOgwgST3;OT*%ht*Navd z_s)Cw-Fx5Y<^MkY91-oMKZa?59tx30-(vA?7T;m1lpGqtde~{amHz zc=QXEo>%Dwm42zxuT=WAN-wH(ku@&`={G_8twQm#Rmz$91*=rf6$|qdV+tup6^b4# z7RnW~P+2hZRm=a^S2}L}$F6);p|)IBp~U2I^Q4)|n}wBBx>Cv&R`w~R&s7VR+?utJ zE9aK-)<~gHte6!zEh{uUxm;XJEt$o&T(($Et({tero5i7mQ!Ypm&%y1o5;eK|0KT_ zZ{zj&DyPE9jr+onVHKhiWf!93c|cpl(WE+bJ)qzjHoPWmdVIlO1P9a}TIoXVQ1@~LvlLMl{FrLf=e z89vVyt1^Ma>F(d{ic>9h!cf;jBL^Z95uuSmPHr-*V9c5f$O-B~sBSmdVt%q$(ZmMi;qA4BmMHU6xg z;*_X)a!tl<;--q~6ueDy5u4@|mnIm_P$-=;lS*e8vn|~fCztD9ScE=OY4KHOs3ao~XL9V~96V;a4a(Ysi@o5g!rEVANuMxUflDb(9|^Nm(>`79Sk$liK? zE_*n0F`H65BFuCQ?Qk6uCPG6y z#4!mh4hk5q>PLmKvRk7E2z_OzD>_SN*>bw{DDb%5u+gFI{pE_OwEbO>yPKOm+FX6x zq9fp}%=LAvfIcwn?qjm2H@A5iCmix7zSDY|x~s#do%q%nAcY1gf)AG=8V25j@2)mV z;U77I@tZJC;JFtwZ!XhY=&csLjc&jQ=_B5laTlq_=me?9Na&qRN=Q7zhB^fB!DF4`GX|3e)?I{hm3 z1nJ}WQnIi4d~h<9AL7F)v|1isP|l zmmj|QF@?*^$K@AA`6c4}_WKUlMYb)zZxtn`#s|+*aCn3C+j%~2_*kL)q(vyqwvnp)9aX{z*s4HHg-R4wT}IGWp$Mf_&{1_8s;yFMDwL+MN*Wt6n2wt5BxWD&nZN7@DopYAVfEZSyXG`$e>5c-xg2eVRUlSo)PHeHN&V z!itJismZ)%xe8w+p(IMywUbcOMz*~5}A7X=cH-4VG de*m7Ab=gK=x0~ZP?4Qv56ZxC?$4}%3{|6c3w$uOs diff --git a/adc-da-sys/target/classes/com/adc/da/sys/page/OrgEOPage.class b/adc-da-sys/target/classes/com/adc/da/sys/page/OrgEOPage.class index cdd9e2fa2056188c6c7deb2a04344df0ccb5cbe2..1e3020638015f59210ebcea8b1ee35c41e25fe87 100644 GIT binary patch delta 324 zcmcbpdtZ0LCl&VmqIBo{lvG9rA)l2dV*U&}CZ6$5o7^L3Hu~c9F^NnZ!8Qfx=)l0?aQb^RdW_bCzUe z7OQ}S7#X>K~Apo~i+rx8-5j$*_x& zfn7%dWYp$AY+o1|`6qwmuwfJdlA@EHIn@~@!K?-#OAgH13uGySS-*fR4KT}`OPx^{ c%qju0jKHjoK$ba}^$y6g0kJk~b1<0J=P5wg3PC delta 283 zcmcbwdr^17CncuL6h;OipRB~PME#t^ymbBGlA_GKbZbTi_WYuB=lqn^$zqJ}*;vz4 zOFUC13ouD?a{-zDP$@&ErEILlV5x^py4+kqCQM3<`K2&>Nk(R|3djbI{F02+A|P|} zUuMP4<}A^S{LByu6{t0v7qhxC%JTxXyZQ$trl)FTrr7c@>}1%*$iSte08_-p{)Lf| zcd`MO=wuO2bw(jDD-g&M2ebNsEEzECG?1kTW^r(-GpYeuHjLU}eiM*y0A}q6vP{9O PKR}ihh_%_0dl@$X0pn13 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 4e5508e122e0dc0164ff6dcde5e1ec1c9456e2f3..af285d023a343d141aa151e32cf3dddda6b6f8df 100644 GIT binary patch delta 2122 zcma)6`EwIx7=AWQy2*B1+EC~vrA3aU2eD94T9ML2DKu0l6+s0M+jEIaa3LFS1h$1F-ap9A2&}XZR$8#_N zPl%;o!IOx~cuL5ph4(XJw@txBB!$Cv5xhgePI!0O@vMT~cuwf|*zvqDy&z04DtHMm zi)Fx$SL}FIV0cZKUl+b_h(#Bndu6;SW1o!ugFFAQl}?KJwrZWx?nsX>u5|@My+JJ= z4oPTp>FX?0yzUNvxX@Xh)FhnJD=nq^Y{#@SL)nE=b{*zOXw+Baxb@v@ zi{8Qk6>sAm#@EPrSH*icD4|SWZz(I1@xF>fIIQ9We5m3GK2q^9j_R6yX5KLzSMdot zWSo%Dpi4O=yhhQt*@}`XPU2G)r|_AI(_&YLK^33ljEb`ul95tz4rvL+H+LPox&PRW zi~DXI+HpNS@awKi*VDr{jt|Q?uVNS%R9wU*3C{6;H}?$ua%4coWelmfg0zgQD!#y% zD!#%Hi>Q^#02N>38x`N8RmFGsUd0b$xrQIl{AM4_a!OEowRmT=wr6ux{U;d z|3-*GuN)fzl^x(5N6Eva@wqxTY+^}`?sm2(VSF3S{q3A@IhOGIIrI`-1o^)RLM6ZW zYDlQzYe6k$L+XZyzmaSz?#M`f4Lr@|$wMho+N#b$8sx^p|BdMk6k{Ius_B6FxRWOd zcVPjtFjvpcos|^6c{~B-uwyFnQDMYX7`n-s7+^9Q(8yRjz3;|C-f~YSv#D7`O%pXX zP6owdz7{kyparem38X2ev{5!xJLMGY-V1Q7(NE?UC#^LpkNhmG z7PVvLoMMDdLxoOinwXMEmQa{<-cLj;urh<_FbBd)TU`c` z^8zNWsZOCVg-N?9CkuHFMcxe38bU43!t&ZNs7@n6axSsflY)6fJKw-tWo915TZb;J zGH5D5Hy$8358u^zkXQt80lEUhwr13}mbNC^SV9+tS;9k1@-QBulOXkXUSmTN2oi5e z8l?x|aF(TU+vzcOr&zGK!m;-tE#<;Ort9DqBG$`qzKZ+A{lVMc?sy2P5o%(1{( z1b7q$V+t1)X}HJApTjQ$Sd@f9p!uBEa!%`X&TAD%rk+F7VzjB9g)YTf4#P%xN9k!n zA=YukL<@qWLH<5AY>qul{({+}qZdU8h?5lzj?a8kYjejY98A*0u!;D~_$h726VG3kxyI4;XZ11uX8I1xk`C*^X=z-f#KoRRjdJaA5W z=M7Zgf-JZwa7o~@CNMtz{g+>PXD|2?GozwYSyYc@3f9?UfhxN>7`A)VsQptfi(SEl ziL1D#K*5@Do_XdP29tM6A$pv&ITHS79N>+j2?j} z_DG;N_7u-dOyRkS7t*W8OB1i~dZxpe)+}xl6hlD`KNU++OIt^k7SSeY{j{Xyx}3Wl zts}L^NRE*fM*Ip3fmVJh+L&I=f37+RMYi-a z-kpw$BJ}(`0tGu1iCblvBFcwT9}xPAaJI@fhlqw@IicoESPMZv$+aFK$`NC`Br{DU zT}wjA+wQh5@phxb;S~hv#2O-mxbI@U#)FnmL(*LO$FVV#v5`}pc>n&`c`75UrLN6m8 zNf$f2a&9EiCT#YI-ty1;WX>a6JdcV(x`-u3R8G;xq@6`P?~!JRTBTty`wunhG_Z1H zZJ`9Md}3`5Z_4dl;%!AA`W=}f*n+KulmB}gwv$DIOXwtIZlILg!JIcjUulG$47$VY YLY`3-gQ$>CK16pnZ`d=5z1Ro*0a@30H~;_u diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml index 9751bb0..c1c56ea 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml @@ -4,11 +4,11 @@ - - and id = #{pageVO.id} + + and org_code = #{pageVO.orgCode} - - and ORG_CODE = #{pageVO.orgCode} + + and UUID = #{pageVO.UUID} and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%') @@ -45,4 +45,15 @@ + diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml index a136665..924b657 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -58,7 +58,7 @@ - + @@ -103,13 +103,13 @@ r.is_default as isDefault, r.name as name, r.remarks as remarks, - org.id as orgId, + org.org_code as orgId, org.org_name from TS_USER u left join TR_USER_ROLE ur on u.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_org uo on u.usid = uo.user_id - left join TS_org org on uo.org_id = org.id and org.status = 1 + left join TS_org org on uo.org_id = org.org_code and org.status = 1 where u.usid = #{id} @@ -160,7 +160,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -169,7 +169,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.del_flag != 1 and users.usid in @@ -186,7 +186,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -195,7 +195,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.del_flag != 1 and users.usid=#{usid} @@ -209,7 +209,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -218,7 +218,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.usid=#{usid} @@ -233,7 +233,7 @@ r.del_flag as r_delFlag, r.is_default as r_is_default, r.name as r_name, - o.id as o_id, + o.org_code as o_id, o.org_code as o_org_code, o.org_name as o_org_name, o.sup_org_code as o_sup_org_code, @@ -242,7 +242,7 @@ left join TR_USER_ROLE ur on users.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_ORG uo on users.usid = uo.user_id - left join TS_ORG o on uo.org_id = o.id + left join TS_ORG o on uo.org_id = o.org_code where users.usid in #{id} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index 82edc9b..05fccee 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -153,9 +153,9 @@ public class ActivitDefineController { String id = jsonObject.getString("id"); String userId = jsonObject.getString("loginUserId"); String bpnId = jsonObject.getString("bpnId"); - String reportId = jsonObject.getString("reportId"); - Object dataMsg = jsonObject.get("dataMsg"); - Object approveData =jsonObject.get("approveData"); +// String reportId = jsonObject.getString("reportId"); +// Object dataMsg = jsonObject.get("dataMsg"); +// Object approveData =jsonObject.get("approveData"); // 创建查询对象 ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class index 3258a07ca0d2ed32c1d7653c7ab0f27a65486d7f..ab7e5debd6f29f951438bcc63adc34e5668957ec 100644 GIT binary patch delta 4543 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 U*L5P~F73~5a=cJQ`*_iR0G*Sx$N&HU delta 4750 zcmb7Hd3aRS761KiX7XO%T(Z1m5(XD`kt}Q`A|phhplm@9FrXlff`}qPf~dHRmAcn; zYBef~3vP7*B11+jASzPaKx(b6V%>Lf--^<6-Xvo_?LYm#$$jUXd(OFMyXV~8JO8QE z65D=ybOV5DGv33MtjWU_JUGI^JjCM=#vLB&AoQ!I5xV@w z;Yj_C@^}P~jBqr^L^zh?bQ$lkPSs9uu`7Zok5Ww&T_z?)cr+*LGR5Ikm(d9J<1xxo z?{J!j?t1ui7cCx-<#8_7x@h${gEKuI&slohZ*^(V=XyMu^IUwc z-%~uE%D9U!UF`P6%lR(8a*_C2_l|P$t;;ptqYP*a49 zc}9dw)XLF3)8SeA6~?n87|W%)eU8I(U7qKmj^}$!@B)Xw^Dv1ux?JdRnTIKg)G_gU zC0(S;#j5?12ruPj9xvw=O8bM$-VU!+@G4!dcA2l=Yw~z4uk&O{D*8tiy*|P}@dk%C zdN^5w)~w%~lz6jp-=ffRkGJwRU20vf5LXktT@~D+3hs1yR|LbkGQzugk2-UV2K3%M z-pBi0mU;X$AJFtXsF8U{Ss!+}%H?X0YbXg?!$&->Wy<9`HNf&iux?EvK2y;o^}(7dIVlcKC!;ic~_&2=|(Bsk>;-!p235$IK?2*$s;u z>YC;fe)9HxOKhZJ;lf3YOXiFea?AEkwJd&8v`V@hJ|(%33=p%DlkC{!Ymu^+L_w0y z7Kcw0CnO*0wSRJGkCJ3v!JwA&ikeL4J8_rAA920It(Je~HiyqxKFjBlZb`RZ&+`S# z?c8DcB6nK;O_!JWcgvT#&GH|7g{VpH$gP=T`A`1K;j5OfahLdF`8xkC4q3jzH!a`d z+eD{R8kRKlKV$K{`Tgq}7Fxc;cP-!J`v^4e%k&ueh4W5U+t8pq;K zxWO^5HF?I9h+7jemgtdO-EF^QqFXo_Ded8Q;vQ@AO+m7zv?l*f?r}_^HAQ?*1Gd`M zB&_jGF_HhXH;D&Cn9TAsOOrSn&%+X#P6T z)R;WM<<7~vQn3E=mC{GJd>yzt(0#Y8YB|sk_sD8947eBf2}azHKO>~V=0b#8Ug|TH zygTXltxqWPQeoeW-gp2H3UoE5;UPSXh{z3WQ=rf)tX8E0tr5rsPzxSGP5`YHD1-

Y|093 zfF~+|!N}c%K@K(-?8U+G96aIRN%@gN3pscy_-z4xM1zB;9c=v`ksrk7zlv~CNL+z9 z0kj|itQBCJ{24qG6u=De=vndfxh6c17Zf-Sp~JCV7*;ijsL*$0(KU*`m_=I@-I+z# zD*89Plu^Pa{9T}z@sCU@@Bwm?@0QPzOpLGS6J(-VA_pAX9(94*qApM->K-Nr5zfIR z35&)x6ogO{o}p|MiUuhUW)F%aAo+pYd1Ag$)$NS8uLR!KwtJgs!av*HHCYe-r@I{- z`j;I0Dqd@IXtcyg3Im1ZkHA!crBQyPgHdmaQE%aGiKP^LxL%Aalk@Mb@cXx7Knerv zEBrwz9Mp>HW)xQVH36FZta3=A!aqbd;!cG>B!zg~t?&=kZ=U*-Mh+48VqO~3xCciR z=tL>;d}0#{(x{Z}PO(m{D2nI%UE&3?{4{)_6~+qFkmlQrYK2OaJsK~H75PKc=xijN z!(yQnYMYTz;-Ge7yx^X_TeBy}RO<@iyGt&{6LKM5me&1_wC(rtAPpX30Up*a%s5ta6k0eDk8m2+ zvH>YBz&c)lR$huUub0=#3appG@EBY1IG@C3ZpRaRRr=%W*uwV{c$!~etC4nS^0Ccy z!Lz0>o-+gSycvP*W&(DYqt6i&-<6WS z9!KImF*VBf#kCLcAxcF5GJGVvQPDmFAIr5a)oX}EW+*B62|ks(T5itA?qH@2FlXU2 znLRmDz76VgmHs0l#jbi2;YgC0vg_p@9_f)S-@ue2huq?kY~yO`AP2Z zL<#g>nSI4UtJNl*iNOZp3j8Hef{gJS#Q4l%8zF}UXKg}$(2~zXZqL0)T!um&Sv0}a zlJTUotL?`eM}8fqm~3p3i6_%*uQ*ry{|GYVFzhhbk+CQ~tqkTsmW$}}!k zecIohn3KjOl&hQPUmBCNmyhRG`VBe@y5*q0(w~{Uwz`WvZXT$v2%<7tYzAg#qcStN z^psdlWly>EM()>G_6n|lHw>H#nqgoIIA;m;NlGAAYng9RR?(We*tD7>UIDC