|
@@ -229,7 +229,7 @@
|
|
|
and a.record_time between #{startTime} and #{endTime}
|
|
and a.record_time between #{startTime} and #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="fullJob != null">and c.full_job= #{fullJob}</if>
|
|
<if test="fullJob != null">and c.full_job= #{fullJob}</if>
|
|
|
- <if test="deptId != null">and c.dept_id= #{deptId}</if>
|
|
|
|
|
|
|
+ <if test="deptId != null">and (d.dept_id= #{deptId} or find_in_set(#{deptId},d.ancestors)) </if>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|