wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-25 17:16:27 +08:00
parent f6a4a323c4 1fcde01778
commit 5e08c5600a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml
View File

@ -20,11 +20,12 @@
--> -->
<update id="deleteByUserIds"> <update id="deleteByUserIds">
UPDATE sys_role_user SET del_flag = 0, update_date = NOW(), updater = #{updater} UPDATE sys_role_user SET del_flag = 1, update_date = NOW(), updater = #{updater}
where user_id in where user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")"> <foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId} #{userId}
</foreach> </foreach>
AND del_flag = 0
</update> </update>
<select id="getRoleIdList" resultType="long"> <select id="getRoleIdList" resultType="long">

2
renren-admin/src/main/resources/mapper/sys/SysUserDao.xml
View File

@ -33,7 +33,7 @@
</if> </if>
<if test="role_id != null"> <if test="role_id != null">
AND EXISTS(SELECT 1 FROM sys_role_user WHERE sys_role_user.user_id = t1.id AND sys_role_user.role_id = AND EXISTS(SELECT 1 FROM sys_role_user WHERE sys_role_user.user_id = t1.id AND sys_role_user.role_id =
#{role_id}) AND sys_role_user.del_flag = 0 #{role_id} AND sys_role_user.del_flag = 0)
</if> </if>
</select> </select>