|
@@ -896,8 +896,7 @@
|
|
FROM user
|
|
FROM user
|
|
left join report on user.id = report.creator_id
|
|
left join report on user.id = report.creator_id
|
|
left join department on department.department_id = user.department_id
|
|
left join department on department.department_id = user.department_id
|
|
- WHERE (report.state = 0 or report.state = 1)
|
|
|
|
- and user.company_id = #{companyId} and (user.is_active=1 or(user.is_active=0 and user.inactive_date>=#{startDate}))
|
|
|
|
|
|
+ WHERE user.company_id = #{companyId} and (user.is_active=1 or(user.is_active=0 and user.inactive_date>=#{startDate}))
|
|
<if test="deptIds != null">
|
|
<if test="deptIds != null">
|
|
AND ((user.department_id in
|
|
AND ((user.department_id in
|
|
<foreach collection="deptIds" separator="," index="index" item="item" close=")" open="(">
|
|
<foreach collection="deptIds" separator="," index="index" item="item" close=")" open="(">
|