From 43a66272c3cf05f6dbef47a6837308c16b671d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Fri, 20 Mar 2026 17:33:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/models/soong_workflow_record.py | 2 -- soong_workflow/wizard/soong_workflow_comment_wizard.py | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 6ca409b45..c096933b0 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -201,10 +201,8 @@ class SoongWorkflowRecord(models.Model): # 第一步：基础过滤 - 只处理包含当前用户的记录 base_domain = [('users_ids', 'in', [current_uid])] candidate_records = self.search(base_domain) - if not candidate_records: return [('id', '=', False)] - # 处理 "is_to_do = True" 或 "is_to_do != False" 的情况 if (operator == '=' and value) or (operator == '!=' and not value): # 条件1：approve_state为start的记录ID diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index d9d074812..15841563e 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -386,8 +386,10 @@ class SoongWorkflowCommentWizard(models.TransientModel): return self.env['hr.employee'].sudo().search(domain) elif link_users_group_ids: - role_domain = ['|', ('user_role_id', 'in', link_users_group_ids.user_role_ids.ids), - ('user_role_ids', 'in', link_users_group_ids.user_role_ids.ids)] + role_domain = ['|', '|', ('user_role_id', 'in', link_users_group_ids.user_role_ids.ids), + ('user_role_ids', 'in', link_users_group_ids.user_role_ids.ids), + ('role_group_ids', 'in', link_users_group_ids.ids) + ] if user_role_domain: role_domain = ['|'] + role_domain + user_role_domain domain = role_domain + company_domain + department_domain