Merge branch 'master' into docker_package
This commit is contained in:
commit
5e08c5600a
|
@ -20,11 +20,12 @@
|
|||
|
||||
-->
|
||||
<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
|
||||
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
|
||||
#{userId}
|
||||
</foreach>
|
||||
AND del_flag = 0
|
||||
</update>
|
||||
|
||||
<select id="getRoleIdList" resultType="long">
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
</if>
|
||||
<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 =
|
||||
#{role_id}) AND sys_role_user.del_flag = 0
|
||||
#{role_id} AND sys_role_user.del_flag = 0)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
|
Loading…
Reference in New Issue