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),