FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangjun
2022-09-22 20:36:16 +08:00
parent 26905d00fb 1de8e48996
commit 25766202f4
19 changed files with 544 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
+7
View File
@@ -17,6 +17,7 @@
<result property="uname" column="UNAME"/>
</collection>
</resultMap>
<select id="getRole" resultType="com.adc.da.slrs.sarRole.entity.TsRole">
select * from ts_role r
left join ts_position_role ps
@@ -24,6 +25,12 @@
where ps.position_id=#{positionId}
</select>
<select id="getPositionDataByUserId" resultType="com.adc.da.slrs.sarPosition.entity.TsPosition">
SELECT id,name FROM ts_position
LEFT JOIN ts_user_position ON ts_position.id = ts_user_position.position_id
WHERE ts_user_position.user_id =#{userId}
</select>
<select id="selectPositionAndRole" resultMap="PositionAndRole">
select p.*,r.id rid,r.name r_name ,tu.UNAME as UNAME from ts_position p
left join ts_position_role pr
adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+7 -23
View File
@@ -22,6 +22,7 @@
<result property="unlockFlag" column="unlock_flag"/>
<result property="userType" column="user_type"/>
<result property="ssoId" column="sso_id"/>
<result property="sysPositionIds" column="sys_position_ids"/>
<collection property="positions" ofType="com.adc.da.slrs.sarPosition.entity.TsPosition">
<result property="id" column="p_id"/>
<result property="name" column="p_name"/>
@@ -51,12 +52,8 @@
<select id="getUserUnderInstitutionAll" resultMap="UserPosition">
select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
p.id p_id,p.name p_name from ts_user u
left join ts_user_position up
on u.usid=up.user_id
left join ts_position p
on up.position_id=p.id
,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,u.SYS_POSITION_IDS
from ts_user u
where 1=1
<if test=" null != ids and ids.size()> 0">
and INSTITUTION_ID in
@@ -76,12 +73,7 @@
<select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
p.id p_id,p.name p_name from ts_user u
left join ts_user_position up
on u.usid=up.user_id
left join ts_position p
on up.position_id=p.id
,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,u.SYS_POSITION_IDS from ts_user u
where 1=1
<if test="TsUser.uname != null and TsUser.uname != '' ">
and (u.uname like concat('%',#{TsUser.uname},'%') or u.ACCOUNT like concat(#{TsUser.uname},'%'))
@@ -90,21 +82,17 @@
and u.email like concat('%',#{TsUser.email},'%')
</if>
<if test=" null != ids and ids.size()> 0">
and INSTITUTION_ID in
and u.INSTITUTION_ID in
<foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
#{id}
</foreach>
</if>
ORDER BY p.id is null,p.create_time
ORDER BY u.SYS_POSITION_IDS is null,u.USID
limit #{start},#{end}
</select>
<select id="userUnderInstitutionCount" resultType="java.lang.Integer">
select count(u.USID) from ts_user u
left join ts_user_position up
on u.usid=up.user_id
left join ts_position p
on up.position_id=p.id
where 1=1
<if test="TsUser.uname != null and TsUser.uname != '' ">
and u.uname like concat('%',#{TsUser.uname},'%')
@@ -113,7 +101,7 @@
and u.email like concat('%',#{TsUser.email},'%')
</if>
<if test=" null != ids and ids.size()> 0">
and INSTITUTION_ID in
and u.INSTITUTION_ID in
<foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
#{id}
</foreach>
@@ -122,10 +110,6 @@
<select id="getUserAndPositionCount" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultType="java.lang.Integer">
select count(u.USID) from ts_user u
left join ts_user_position up
on u.usid=up.user_id
left join ts_position p
on up.position_id=p.id
where 1=1
<if test="TsUser.institutionId != null and TsUser.institutionId != '' ">
and u.institution_id=#{TsUser.institutionId}