From 5b5b17fc997398bc9e0e6c93edd01712c19411de 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: Thu, 18 Jun 2026 15:41:08 +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/templates/soong_workflow_templates.xml | 1 - soong_workflow/wizard/soong_workflow_comment_wizard.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml index f6b4a8840..1f7171a23 100644 --- a/soong_workflow/templates/soong_workflow_templates.xml +++ b/soong_workflow/templates/soong_workflow_templates.xml @@ -15,7 +15,6 @@ - diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index fd511b9e8..03414308a 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -785,12 +785,13 @@ class SoongWorkflowCommentWizard(models.TransientModel): is_admin = current_user.has_group('base.group_system') # 归档判断 last_log = record_id.log_ids[-1] if record_id.log_ids else None + all_user = True if record_id.log_ids[-1].done_by == current_user else False if last_log: same_name_logs = record_id.log_ids.filtered( lambda log: log.name == last_log.name and log.node_btn_name == '4' and log.id != last_log.id ) all_approved = all(log.approval_state in ['2', '3'] for log in same_name_logs) or not same_name_logs - if all_approved: + if all_approved and all_user: workflow_record = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id), ('res_model', '=',record_id._name), ('reclaim_state', '=', False),