|
|
|
@ -146,10 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
|
|
|
left join sys_role r on r.role_id = ur.role_id
|
|
|
|
|
where u.del_flag = '0' and r.role_id = #{roleId}
|
|
|
|
|
<if test="userName != null and userName != ''">
|
|
|
|
|
<if test="user.userName != null and user.userName != ''">
|
|
|
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="phonenumber != null and phonenumber != ''">
|
|
|
|
|
<if test="user.phonenumber != null and user.phonenumber != ''">
|
|
|
|
|
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
</select>
|
|
|
|
@ -162,10 +162,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
|
left join sys_role r on r.role_id = ur.role_id
|
|
|
|
|
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
|
|
|
|
|
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
|
|
|
|
|
<if test="userName != null and userName != ''">
|
|
|
|
|
<if test="user.userName != null and user.userName != ''">
|
|
|
|
|
AND u.user_name like concat('%', #{userName}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="phonenumber != null and phonenumber != ''">
|
|
|
|
|
<if test="user.phonenumber != null and user.phonenumber != ''">
|
|
|
|
|
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
|
|
|
|
</if>
|
|
|
|
|
</select>
|
|
|
|
|