joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
joylink_zhangsai 2021-02-26 10:15:24 +08:00
commit 88720cd004
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/services/OrgUserService.java
View File

@ -379,7 +379,7 @@ public class OrgUserService implements IOrgUserService {
orgUserDAO.insertSelective(userDepartRelVO.toDB()); orgUserDAO.insertSelective(userDepartRelVO.toDB());
} else { } else {
OrgUserExample e = new OrgUserExample(); OrgUserExample e = new OrgUserExample();
e.createCriteria().andUserIdEqualTo(sysUser.getId()); e.createCriteria().andUserIdEqualTo(userVO.getId());
List<OrgUser> orgUsers = orgUserDAO.selectByExample(e); List<OrgUser> orgUsers = orgUserDAO.selectByExample(e);
BusinessExceptionAssertEnum.INVALID_OPERATION.assertCollectionNotEmpty(orgUsers, sysUser.getAccount() + "账号重复"); BusinessExceptionAssertEnum.INVALID_OPERATION.assertCollectionNotEmpty(orgUsers, sysUser.getAccount() + "账号重复");
OrgExample oe = new OrgExample(); OrgExample oe = new OrgExample();

2
src/main/resources/mybatis/mapper/OrgUserDAO.xml
View File

@ -237,7 +237,7 @@
<result column="userId" jdbcType="BIGINT" property="userId"/> <result column="userId" jdbcType="BIGINT" property="userId"/>
<result column="account" jdbcType="VARCHAR" property="account"/> <result column="account" jdbcType="VARCHAR" property="account"/>
<result column="userName" jdbcType="VARCHAR" property="name"/> <result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap> </resultMap>
<select id="getCompanyDepartUsers" parameterType="club.joylink.rtss.vo.client.company.CompanyUserQueryVO" resultMap ="CompanyUserInfo"> <select id="getCompanyDepartUsers" parameterType="club.joylink.rtss.vo.client.company.CompanyUserQueryVO" resultMap ="CompanyUserInfo">