1
This commit is contained in:
@@ -89,20 +89,15 @@ class SoongWorkflowCommentWizard(models.TransientModel):
|
||||
workflow_id = self.trans_link_id.node_button_id.workflow_id
|
||||
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
|
||||
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 = self.env['hr.employee'].search(['|', ('user_role_id', '=', link_users_id.id),
|
||||
('user_role_ids', 'in', link_users_id.id)])
|
||||
# 自动匹配
|
||||
employee_user_role_ids = self.env['hr.employee'].search(['|', ('user_role_id', '=', link_users_id.id), ('user_role_ids', 'in', link_users_id.id), ('company_id', '=', self.env.user.company_id.id)]) # 自动匹配
|
||||
employee_user_role_id = self.env['hr.employee'].search(['|', ('user_role_id', '=', link_users_id.id), ('user_role_ids', 'in', link_users_id.id),
|
||||
'|', ('department_id', '=', record_id.department_id.id),
|
||||
('department_ids', 'in', record_id.department_id.id)])
|
||||
'|', ('department_id', '=', record_id.department_id.id), ('department_ids', 'in', record_id.department_id.id), ('company_id', '=', self.env.user.company_id.id)]) # 不自动匹配
|
||||
if not employee_user_role_id:
|
||||
employee_user_role_id = self.env['hr.employee'].search(
|
||||
['|', ('user_role_id', '=', link_users_id.id), ('user_role_ids', 'in', link_users_id.id),
|
||||
'|', ('department_id', '=', record_id.department_id.parent_id.id),
|
||||
('department_ids', 'in', record_id.department_id.parent_id.id)])
|
||||
self.employee_trans_domain_ids = employee_user_role_ids if not next_is_automatic else employee_user_role_id
|
||||
self.employee_ids = employee_user_role_ids if not next_is_automatic else employee_user_role_id
|
||||
'|', ('department_id', '=', record_id.department_id.parent_id.id), ('department_ids', 'in', record_id.department_id.parent_id.id)])
|
||||
self.employee_trans_domain_ids = employee_user_role_ids if next_is_automatic else employee_user_role_id
|
||||
self.employee_ids = employee_user_role_ids if next_is_automatic else employee_user_role_id
|
||||
if '分发' in ret.name:
|
||||
self.employee_ids = record_id.users_id.employee_id
|
||||
|
||||
|
||||
Reference in New Issue
Block a user