From 99a6be7dd15d535c6c9e5c072a49015e5b04c243 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: Fri, 13 Feb 2026 10:29:47 +0800 Subject: [PATCH 1/2] =?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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index d65253bc6..dd73ac2b6 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -1297,9 +1297,10 @@ class HrAttendance(models.Model): go_approval_domain = [ ('employee_ids', 'in', employee.id), ('start_date', '<=', current_date_str), - ('end_date', '>=', current_date_str) + ('end_date', '>=', current_date_str), + ('work_end', '=', True), ] - go_approval_record = self.env['go.approval'].search(go_approval_domain) + go_approval_record = self.env['go.approval'].search(go_approval_domain, limit=1) if go_approval_record: workflow = self.env['soong.workflow.record'].search([ ('code', '=', go_approval_record.code) From 5da1c700dc36b046ece0bc523ed450ea7ffee913 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: Fri, 13 Feb 2026 10:47:10 +0800 Subject: [PATCH 2/2] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py index dd73ac2b6..e385c0fc2 100644 --- a/yuthon_hr_attendance/models/hr_attendance.py +++ b/yuthon_hr_attendance/models/hr_attendance.py @@ -676,7 +676,7 @@ class HrAttendance(models.Model): next_day = current_date + timedelta(days=1) start_datetime = datetime.combine(current_date, datetime.min.time()) - timedelta(hours=8) check_out_end = self.float_to_datetime(current_date, template.check_out_end) - if template.day2 == '次日': + if template.check_out_end < template.check_out_start: check_out_end = self.float_to_datetime(next_day, template.check_out_end) domain = [ ('employee_id', '=', employee_id.id),