|
|
@@ -269,7 +269,7 @@
|
|
|
LEFT JOIN biz_user_tenant ut ON ut.user_id = u.user_id
|
|
|
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} or r.role_id IS NULL) and u.user_id != 1 and u.user_id !=2
|
|
|
+ WHERE u.del_flag = '0' AND (r.role_id != #{roleId} or r.role_id IS NULL) and u.user_id != 1 and u.user_id !=2 and u.user_type = '02'
|
|
|
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 != ''">
|
|
|
AND u.user_name LIKE concat('%', #{userName}, '%')
|
