From efabc91c47f0573e3ef0933219a26b14886bbac4 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: Mon, 13 Jul 2026 16:43:29 +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 --- .../wizard/soong_workflow_comment_wizard.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 151661a89..851c5e246 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -771,14 +771,6 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_btn_name in ['结束', '确认']: title = record_id._description current_comment = self.comment or '' - # 自动设置审批结果为 不通过 - if any(keyword in current_comment for keyword in ['不同意', '不批准', '不通过']): - if hasattr(record_id, 'approval_result'): - record_id.approval_result = 'fail' - else: - if hasattr(record_id, 'approval_result'): - record_id.approval_result = 'pass' - self.node_btn_id.with_context(cx).run() if 'Room Booking' == record_id._description: title = '会议通知' is_work_remind = False @@ -842,6 +834,14 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'soong_state': 'done', }) record_id.work_end = True + # 自动设置审批结果为 不通过 + if any(keyword in current_comment for keyword in ['不同意', '不批准', '不通过']): + if hasattr(record_id, 'approval_result'): + record_id.approval_result = 'fail' + else: + if hasattr(record_id, 'approval_result'): + record_id.approval_result = 'pass' + self.node_btn_id.with_context(cx).run() if is_admin: user_log = record_id.log_ids.filtered(