Merge pull request !1590 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-02-26 07:47:02 +00:00
committed by Gitee
@@ -72,24 +72,24 @@ class SoongWorkflowCommentWizard(models.TransientModel):
def onchange_trans_employee_ids(self):
record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
for ret in self.trans_link_id:
if '分发' or '信息管理员' in self.trans_link_id.name:
self.employee_ids = record_id.users_id.employee_id
else:
workflow_id = self.trans_link_id.node_button_id.workflow_id
state_list = [i.node_name for i in workflow_id.node_ids]
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),
('yuthon_company', '=', record_id.create_uid.employee_id.yuthon_company)])
# 自动匹配
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),
('yuthon_company', '=', record_id.create_uid.employee_id.yuthon_company)])
self.employee_ids = employee_user_role_ids if not next_is_automatic else employee_user_role_id
# if '分发' or '信息管理员' in self.trans_link_id.name:
# self.employee_ids = record_id.users_id.employee_id
# else:
workflow_id = self.trans_link_id.node_button_id.workflow_id
state_list = [i.node_name for i in workflow_id.node_ids]
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),
('yuthon_company', '=', record_id.create_uid.employee_id.yuthon_company)])
# 自动匹配
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),
('yuthon_company', '=', record_id.create_uid.employee_id.yuthon_company)])
self.employee_ids = employee_user_role_ids if not next_is_automatic else employee_user_role_id
if self.node_btn_name == '退回':
next_list = []
self_state = state_list.index(ret.name)