From 6ef281a2a5d0a236ed167f2007bc622a38be0bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 24 Apr 2025 16:27:28 +0800 Subject: [PATCH] 1 --- soong_workflow/wizard/soong_workflow_comment_wizard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index f1c428077..36111f4c5 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -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)]) # 自动匹配