From dd3e31e3af34f11dca005dd0afd3345ba8ddacde 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: Wed, 3 Dec 2025 16:28:34 +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_mixin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index a6373c48d..458144671 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -279,7 +279,8 @@ class SoongWorkflowMixin(models.AbstractModel): self.env['trans.link'].search([]).unlink() # 退回节点根据日志进行判断 if btn_rec.name == '退回': - for ret in self.log_ids.search([('approval_state', '=', '2'), ('res_id', '=', self.id), ('node_btn_name', '=', '0')]): + approved_logs = self.log_ids.filtered(lambda log: log.approval_state == '2') + for ret in approved_logs: if not self.env['trans.link'].search([('name', '=', ret.name)]): self.env['trans.link'].create({ 'node_button_id': btn_rec.id, @@ -422,8 +423,7 @@ class SoongWorkflowMixin(models.AbstractModel): "default_trans_link_id": self.env['trans.link'].search(trans_domain, limit=1).id if btn_rec.name == '转交' else False, "all_workflow_links": trans_link_ids, "default_return_link_id": self.env['trans.link'].search( - [('record_id', '=', self.id)], - limit=1).id if btn_rec.name == '退回' else False, + [('link_type', '=', 'return'), ('record_id', '=', self.id)], limit=1).id if btn_rec.name == '退回' else False, }, }