Commit 4c65eb43 authored by nie'hong's avatar nie'hong

完善工时统计

parent 62e6978e
......@@ -118,7 +118,7 @@
<if test="deptId != null and managerId == null">
AND p.dept_id = #{deptId} AND year(statistics_start) = #{year}
</if>
<if test="deptId != null and managerId == null">
<if test="deptId != null and managerId != null">
AND (p.dept_id = #{deptId} OR p.manager_id= #{managerId}) AND year(statistics_start) = #{year}
</if>
<if test="deptId == null and managerId != null">
......@@ -140,7 +140,7 @@
<if test="deptId != null and managerId == null">
AND p.dept_id = #{deptId} AND year(statistics_start) = #{year}
</if>
<if test="deptId != null and managerId == null">
<if test="deptId != null and managerId != null">
AND (p.dept_id = #{deptId} OR p.manager_id= #{managerId}) AND year(statistics_start) = #{year}
</if>
<if test="deptId == null and managerId != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment