From 21bc3e8b531b67e3dbc809a5e32050167c2aa7f6 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, 14 Mar 2026 19:01:27 +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/vacation_overtime_active.py | 1 + yuthon_issue/models/issue_library.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/models/vacation_overtime_active.py b/yuthon_hr_attendance/models/vacation_overtime_active.py index 3bf70510a..0fc73ad6e 100644 --- a/yuthon_hr_attendance/models/vacation_overtime_active.py +++ b/yuthon_hr_attendance/models/vacation_overtime_active.py @@ -133,6 +133,7 @@ class VacationOvertimeActive(models.Model): active_line_id.is_void = True carryover_id = self.env['overtime.carryover'].search([ ('carry_forward_date', '=', self.carry_forward_date), + ('carryover_type', '=', 'fee'), ('over_line_id', '=', active_line_id.over_line_id.id)]) if carryover_id: carryover_id.is_void = True diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index c2390fe34..0ce607496 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -558,8 +558,11 @@ class IssueLibrary(models.Model): ]) for issue in issue_active_ids: dept_manager = self.env['hr.employee'].search([ - ('department_id', '=', issue.department_id.id), + ('active', '=', True), ('user_role_id.name', '=', '部门经理'), + '|', + ('department_id', '=', issue.department_id.id), + ('department_ids', 'in', [issue.department_id.id]) ], limit=1) issue_details.append((0, 0, { 'issue_library_id': issue.id,