|
|
|
|
@ -101,8 +101,8 @@ |
|
|
|
|
select distinct su.id, su.nickname, su.username, su.email, |
|
|
|
|
su.mobile_phone, su.enable,su.create_time |
|
|
|
|
from sys_user su |
|
|
|
|
inner join sys_user_role sur on su.id = sur.user_id |
|
|
|
|
inner join sys_role sr on sr.id = sur.role_id |
|
|
|
|
left join sys_user_role sur on su.id = sur.user_id |
|
|
|
|
left join sys_role sr on sr.id = sur.role_id |
|
|
|
|
where su.del_flag = '0' and sr.id = #{user.roleId} |
|
|
|
|
<if test="user.userName != null and user.userName != ''"> |
|
|
|
|
AND su.username like concat('%', #{user.userName}, '%') |
|
|
|
|
@ -115,8 +115,8 @@ |
|
|
|
|
select distinct su.id, su.nickname, su.username, su.email, |
|
|
|
|
su.mobile_phone, su.enable,su.create_time |
|
|
|
|
from sys_user su |
|
|
|
|
inner join sys_user_role sur on su.id = sur.user_id |
|
|
|
|
inner join sys_role sr on sr.id = sur.role_id |
|
|
|
|
left join sys_user_role sur on su.id = sur.user_id |
|
|
|
|
left join sys_role sr on sr.id = sur.role_id |
|
|
|
|
where su.del_flag = '0' and (sr.id != #{user.roleId} or sr.id is null ) |
|
|
|
|
<if test="user.userName != null and user.userName != ''"> |
|
|
|
|
AND su.username like concat('%', #{user.userName}, '%') |
|
|
|
|
|