From 80198df996f65f3328315c81e34c620538feb06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Mon, 30 Mar 2026 19:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/models/hr_attendance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index d0999a643..fdcce548d 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -1340,12 +1340,12 @@ class HrAttendance(models.Model): match_record = False for go in go_approval_records: # 按天匹配 - if go.start_date and go.end_date: + if go.start_date and go.end_date and go.is_day: if go.start_date <= current_date <= go.end_date: match_record = go break # 按小时匹配 - if go.date_start and go.date_end: + if go.date_start and go.date_end and go.is_hour: go_start = fields.Datetime.from_string(go.date_start) go_end = fields.Datetime.from_string(go.date_end) if go_start <= current_date_end and go_end >= current_date_start: