Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

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

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,