From 2eb02b33c1f85acc06d2b7b2dc5030d618d10f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 26 Feb 2025 15:46:28 +0800 Subject: [PATCH] 1 --- .../wizard/soong_workflow_comment_wizard.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index e04bda1c9..2528be53d 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -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)