|
|
@ -50,9 +50,9 @@
|
|
|
|
auth_dept.`name` deptName,
|
|
|
|
auth_dept.`name` deptName,
|
|
|
|
auth_user.comments
|
|
|
|
auth_user.comments
|
|
|
|
FROM auth_dept_user
|
|
|
|
FROM auth_dept_user
|
|
|
|
INNER JOIN auth_user
|
|
|
|
right JOIN auth_user
|
|
|
|
on auth_dept_user.userId = auth_user.id
|
|
|
|
on auth_dept_user.userId = auth_user.id
|
|
|
|
INNER JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
|
|
|
|
left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="deptId != null">
|
|
|
|
<if test="deptId != null">
|
|
|
|
and deptId = #{deptId}
|
|
|
|
and deptId = #{deptId}
|
|
|
@ -65,6 +65,7 @@
|
|
|
|
auth_user.employeeName like concat('%', #{key}, '%'))
|
|
|
|
auth_user.employeeName like concat('%', #{key}, '%'))
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
|
|
|
|
group by auth_dept_user.userId
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|