Merge remote-tracking branch 'remotes/origin/master' into dingding

This commit is contained in:
andy 2026-03-09 13:34:46 +08:00
commit 6c1c95352d

View File

@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from rz_leave_detail d left join rz_leave l on d.leave_id = l.id
where l.user_id = #{userId}
and l.del_flag = '0'
and d.del_flag = '0'
and DATE_FORMAT( d.leave_start_time, '%Y%m%d' ) <= DATE_FORMAT(#{date} , '%Y%m%d' )
and DATE_FORMAT( d.leave_end_time, '%Y%m%d' ) >= DATE_FORMAT(#{date} , '%Y%m%d' )