|
@@ -221,7 +221,7 @@
|
|
FROM report AS a
|
|
FROM report AS a
|
|
JOIN user AS b ON a.creator_id = b.id
|
|
JOIN user AS b ON a.creator_id = b.id
|
|
left join department on department.department_id = b.department_id
|
|
left join department on department.department_id = b.department_id
|
|
- WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data > 0
|
|
|
|
|
|
+ WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data <> 0
|
|
<if test="startDate != null and endDate != null">
|
|
<if test="startDate != null and endDate != null">
|
|
AND a.create_date between #{startDate} and #{endDate}
|
|
AND a.create_date between #{startDate} and #{endDate}
|
|
</if>
|
|
</if>
|
|
@@ -241,7 +241,7 @@
|
|
JOIN user AS b ON a.creator_id = b.id
|
|
JOIN user AS b ON a.creator_id = b.id
|
|
left join department on department.department_id = b.department_id
|
|
left join department on department.department_id = b.department_id
|
|
left join project on project.id = a.project_id
|
|
left join project on project.id = a.project_id
|
|
- WHERE a.state = 1 and b.company_id = #{companyId}
|
|
|
|
|
|
+ WHERE a.state = 1 and b.company_id = #{companyId} and a.custom_data <> 0
|
|
<if test="startDate != null and endDate != null">
|
|
<if test="startDate != null and endDate != null">
|
|
AND a.create_date between #{startDate} and #{endDate}
|
|
AND a.create_date between #{startDate} and #{endDate}
|
|
</if>
|
|
</if>
|