|
@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
ancestors) ))
|
|
|
</if>
|
|
|
<if test="keyword != null and keyword != ''">
|
|
|
- AND (instr(u.nick_name,#{keyword}) or instr(u.user_name,#{keyword}))
|
|
|
+ AND (instr(u.nick_name,#{keyword}) or instr(u.user_name,#{keyword}) or u.user_id in (SELECT DISTINCT ur.user_id FROM sys_user_role ur JOIN sys_role r ON ur.role_id = r.role_id WHERE instr(r.role_name,#{keyword})))
|
|
|
</if>
|
|
|
<if test="nickName != null and nickName != ''">
|
|
|
AND instr(u.nick_name,#{nickName})
|