This commit is contained in:
李鹏宇
2025-04-24 16:27:28 +08:00
parent ddadba3d17
commit 6ef281a2a5
@@ -90,7 +90,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
link_users_id = workflow_id.node_ids.search([('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].users_role_id
link_users_group_id = workflow_id.node_ids.search([('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].users_role_group_id
next_is_automatic = workflow_id.node_ids.search([('name', '=', self.trans_link_id.name), ('workflow_id', '=', workflow_id.id)]).button_ids[0].is_automatic
employee_user_role_ids = employee_user_role_id = ''
employee_user_role_ids = employee_user_role_id = False
if link_users_id and link_users_group_id:
raise UserError('流程配置错误,节点不允许配置两种类型')
if link_users_id:
@@ -99,9 +99,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
'|', ('department_id', '=', record_id.department_id.id), ('department_ids', 'in', record_id.department_id.id), ('company_id', '=', self.env.user.company_id.id)]) # 不自动匹配
elif link_users_group_id:
# 不自动匹配
employee_role_ids = self.env['hr.employee'].search(['|', ('user_role_id', 'in', link_users_group_id.user_role_ids.ids),('user_role_ids', 'in', link_users_group_id.user_role_ids.ids), ])
employee_user_role_ids = self.env['hr.employee'].search(['|', ('user_role_id', 'in', link_users_group_id.user_role_ids.ids),('user_role_ids', 'in', link_users_group_id.user_role_ids.ids), ])
# 自动匹配
employee_user_role_id = self.env['hr.employee'].search([('id', 'in', employee_role_ids.ids),
employee_user_role_id = self.env['hr.employee'].search([('id', 'in', employee_user_role_ids.ids),
'|', ('department_id', '=', record_id.department_id.id),
('department_ids', 'in', record_id.department_id.id),
('company_id', '=', self.env.user.company_id.id)]) # 自动匹配