From fea8bf7b18235e1976dd49ee2eccecc116eace58 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: Sat, 28 Feb 2026 22:17:28 +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/yuthon_vacation_reports.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index 764de7add..e2e9bdba3 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -430,7 +430,8 @@ class YuthonVacationReports(models.Model):
             if inherit_overtime_lines:
                 inherit_over_update_lines = inherit_overtime_lines.workday + inherit_overtime_lines.public_holidays
                 rec.dynamic_previous_year1 = inherit_over_update_lines / 8  # 初始补休上年剩余
-                rec.last_workday = inherit_over_update_lines / 8 - rec.last_holiday if rec.last_holiday else inherit_over_update_lines / 8
+                rec.last_workday = inherit_overtime_lines.workday / 8
+                rec.last_holiday = inherit_overtime_lines.public_holidays / 8
 
             # 3. 筛选overtime_ids中workflow_record_id有值且update_type="增加"的明细，计算总增加额
             over_increase_lines = rec.overtime_ids.filtered(