diff --git a/yuthon_hr_employee/models/inherit_res_groups.py b/yuthon_hr_employee/models/inherit_res_groups.py index 86215a770..edf389827 100644 --- a/yuthon_hr_employee/models/inherit_res_groups.py +++ b/yuthon_hr_employee/models/inherit_res_groups.py @@ -18,7 +18,6 @@ class ResGroups(models.Model): def users_add(self): self.write({'users': [(4, user.user_id.id) for user in self.employee_ids]}) - def get_department_employees(department_id): valid_user_ids = set() employee_ids = self.env['hr.employee'].search([('department_id', '=', department_id.id)]) @@ -31,6 +30,7 @@ class ResGroups(models.Model): valid_user_ids = get_department_employees(department_id) if valid_user_ids: self.write({'users': [(4, user_id) for user_id in valid_user_ids]}) + for user_role in self.user_role_ids: user_employee_ids = self.env['hr.employee'].search(['|', ('user_role_id', '=', user_role.id), ('user_role_ids', 'in', [user_role.id])]) self.write({'users': [(4, user.user_id.id) for user in user_employee_ids]}) \ No newline at end of file