Merge remote-tracking branch 'origin/dev' into dev

2026-02-11 15:40:41 +08:00
parent 2890be48a1 df3dd0dd7e
commit b7ca27637a
1 changed files with 6 additions and 2 deletions
@@ -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']  # 请假开始日期（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