From 0662de91c6b7d12a92f686503343b35619ebb816 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: Thu, 26 Feb 2026 16:46:37 +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_holiday/models/inherit_hr_leave.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 0eb90a079..0bab2bd08 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -215,15 +215,16 @@ class HrLeave(models.Model):
     def _compute_duration(self):
         super()._compute_duration()
         for holiday in self:
-            # 如果是自然日:(按小时请假）
+            # 如果是自然日:
             if holiday.holiday_status_id.type_of_work == "1":
-                if holiday.request_date_from and holiday.request_date_to:
+                if holiday.batch_id:
                     days = (holiday.request_date_to - holiday.request_date_from).days + 1
                     hours = days * 8
                 else:
-                    hours = 0.0
+                    hours = (float(holiday.request_hour_to) - float(holiday.request_hour_from))
                 holiday.number_of_hours = hours
                 holiday.leave_hours = hours
+
             if holiday.holiday_status_id.type_of_work == "0":
                 if holiday.request_hour_from and holiday.request_hour_to:
                     start_hour = float(holiday.request_hour_from)