|
|
@@ -993,10 +993,12 @@
|
|
993
|
993
|
where (u.dept_id = #{deptId} OR u.dept_id IN (
|
|
994
|
994
|
SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
|
|
995
|
995
|
and u.del_flag = '0'
|
|
996
|
|
- and r.role_key in
|
|
997
|
|
- <foreach collection="list" item="item" open="(" separator="," close=")">
|
|
998
|
|
- #{item}
|
|
999
|
|
- </foreach>
|
|
|
996
|
+ <if test="list != null and list.size() > 0">
|
|
|
997
|
+ and r.role_key in
|
|
|
998
|
+ <foreach collection="list" item="item" open="(" separator="," close=")">
|
|
|
999
|
+ #{item}
|
|
|
1000
|
+ </foreach>
|
|
|
1001
|
+ </if>
|
|
1000
|
1002
|
<if test="nickName != null and nickName != ''">
|
|
1001
|
1003
|
and u.nick_name like concat('%', #{nickName}, '%')
|
|
1002
|
1004
|
</if>
|