From 67fc0bfdeb87b22ac9c32a626aa4c8cd2f933c27 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, 20 Mar 2026 11:23:16 +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 | 19 +++++++++++++++----
yuthon_issue/views/issue_library_views.xml | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index a8f0403bd..d9d074812 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -697,14 +697,25 @@ class SoongWorkflowCommentWizard(models.TransientModel):
current_datetime = fields.Datetime.now()
is_admin = current_user.has_group('base.group_system')
if is_admin:
- last_log = record_id.log_ids[-1]
- if last_log.approval_state not in ['2', '3']:
- last_log.sudo().write({
+ user_log = record_id.log_ids.filtered(
+ lambda log: log.done_by == current_user and log.node_btn_name != '1' and log.approval_state == '0'
+ )
+ if user_log:
+ user_log.write({
'comment': self.comment,
'approval_state': "2",
- 'lase_click_date': fields.Datetime.now() - timedelta(hours=8),
+ 'lase_click_date': current_datetime,
'document_ids': [(6, 0, self.document_ids.ids)]
})
+ else:
+ last_log = record_id.log_ids[-1]
+ if last_log.approval_state not in ['2', '3']:
+ last_log.sudo().write({
+ 'comment': self.comment,
+ 'approval_state': "2",
+ 'lase_click_date': fields.Datetime.now() - timedelta(hours=8),
+ 'document_ids': [(6, 0, self.document_ids.ids)]
+ })
self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({'approve_state': 'end',
"employee_ids": False,
"node_id": False, })
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index c1846ce77..616874b91 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -57,7 +57,7 @@
-
+