|
@@ -160,8 +160,8 @@
|
|
|
<where>
|
|
|
<if test="dataStatus != null and dataStatus != ''">and data_status = #{dataStatus}</if>
|
|
|
<if test="dataDeptId != null ">and data_dept_id = #{dataDeptId}</if>
|
|
|
- <if test="leaveStartTime != null ">and leave_start_time = #{leaveStartTime}</if>
|
|
|
- <if test="leaveEndTime != null ">and leave_end_time = #{leaveEndTime}</if>
|
|
|
+ <if test="leaveStartTime != null ">and leave_start_time >= #{leaveStartTime}</if>
|
|
|
+ <if test="leaveEndTime != null ">and leave_end_time <= #{leaveEndTime}</if>
|
|
|
<if test="forestLeaveStatus != null and forestLeaveStatus != ''">and forest_leave_status =
|
|
|
#{forestLeaveStatus}
|
|
|
</if>
|