From 5dcb2b0d29d0ad5f94a11182d679660dbe89d4b0 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, 16 Jan 2026 16:07:23 +0800 Subject: [PATCH 1/2] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 741d9c02c..c5955d6e8 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -96,7 +96,7 @@ class SoongWorkflowMixin(models.AbstractModel): # 判断当前节点的状态 matched_logs = record.log_ids.filtered(lambda log: log.name == current_state) if matched_logs: - if matched_logs[-1].approval_state != '0': + if matched_logs[-1].approval_state == '0': record.is_back = True if record._name in ['yuthon.official.incoming.normal', 'yuthon.sub.enterprises']: current_user_in_logs2 = any(log.done_by.id == self.env.uid for log in record.log_ids2) From bcdbe2a32a6c2e5cc50d01af6cdcdc25f34db1d1 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, 16 Jan 2026 16:11:52 +0800 Subject: [PATCH 2/2] =?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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 2e0034614..ec8bc0322 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -567,13 +567,20 @@ class SoongWorkflowCommentWizard(models.TransientModel): 'lase_click_date': current_datetime, 'document_ids': [(6, 0, self.document_ids.ids)] }) - if record_id.log_ids2 and self.node_btn_name == '确认': + if (record_id.log_ids2 or record_id.log_ids.filtered(lambda log: log.name == '承办')) and self.node_btn_name == '确认': user_log2 = record_id.log_ids2.filtered(lambda log: log.done_by == current_user) + user_log1 = record_id.log_ids.filtered(lambda log: log.done_by == current_user) if user_log2: user_log2.write({ 'commit': self.comment, 'approval_state': "2", - 'lase_click_date': current_datetime, + 'lase_click_date': current_datetime + timedelta(hours=8), + }) + if user_log1: + user_log1.write({ + 'commit': self.comment, + 'approval_state': "2", + 'lase_click_date': current_datetime + timedelta(hours=8), }) for employee in self.circulated_employee_ids: action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0]