|
@@ -19,14 +19,16 @@
|
|
|
<select id="getDeptId" resultType="java.lang.Long" parameterType="java.lang.Long">
|
|
|
select dept_id
|
|
|
from sys_dept
|
|
|
- where find_in_set(#{deptId}, ancestors)
|
|
|
+ where dept_id = #{deptId} or find_in_set(#{deptId}, ancestors)
|
|
|
</select>
|
|
|
|
|
|
- <select id="getUserIdByDeptIds" resultType="java.util.List" parameterType="java.lang.Long">
|
|
|
+ <select id="getUserIdByDeptIds" resultType="java.lang.String" parameterType="java.util.List">
|
|
|
select user_id
|
|
|
from sys_user
|
|
|
- where dept_id in #{deptList}
|
|
|
- and data_permission = 3
|
|
|
+ where data_permission = 3 and dept_id in
|
|
|
+ <foreach item="item" collection="deptList" separator="," open="(" close=")" index="">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
</select>
|
|
|
|
|
|
<select id="getUserIdByDeptIdAndUserId" resultType="java.lang.String">
|
|
@@ -46,7 +48,10 @@
|
|
|
<select id="getUserIdByDeptIdsBy5" resultType="java.util.List" parameterType="java.lang.Long">
|
|
|
select user_id
|
|
|
from sys_user
|
|
|
- where dept_id in #{deptList}
|
|
|
+ where dept_id in
|
|
|
+ <foreach item="item" collection="deptList" separator="," open="(" close=")" index="">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
and data_permission = 5
|
|
|
</select>
|
|
|
|