From 71ec3e158c86904db304b29ba0d8bc8c03909c7c 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: Wed, 11 Feb 2026 10:42:02 +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_holiday/models/inherit_hr_leave.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 0b47fefbb..700ce1379 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -527,7 +527,7 @@ class HolidaysRequestBatch(models.Model): :param leave_type_name: 假期类型名称 """ employee_id = self.users_id.employee_ids.id if self.users_id.employee_ids else False - leave_start = leave_data['start'] # 请假开始日期（date） + leave_start = leave_data['start'] if 'start' in leave_data else leave_data['end']# 请假开始日期（date） leave_end = leave_data['end'] # 请假结束日期（date） month_intervals = [] From f063a358e1de880e0be364053c1989c2e80187f1 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: Wed, 11 Feb 2026 10:57:57 +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_holiday/models/inherit_hr_leave.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 700ce1379..aef643427 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -527,8 +527,12 @@ class HolidaysRequestBatch(models.Model): :param leave_type_name: 假期类型名称 """ employee_id = self.users_id.employee_ids.id if self.users_id.employee_ids else False - leave_start = leave_data['start'] if 'start' in leave_data else leave_data['end']# 请假开始日期（date） - leave_end = leave_data['end'] # 请假结束日期（date） + if 'date' in leave_data: + leave_start = leave_data['date'] + leave_end = leave_data['date'] + else: + leave_start = leave_data['start'] if 'start' in leave_data else leave_data['end'] + leave_end = leave_data['end'] month_intervals = [] current_start = leave_start