From 3d92f28ec932e443d5e9dd04bc44195c8cacc413 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 19:51:12 +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/wizard/soong_workflow_comment_wizard.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 851c5e246..38d524aac 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -778,7 +778,9 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             current_datetime = fields.Datetime.now()
             is_admin = current_user.has_group('base.group_system')
             # 归档判断
-            last_log = record_id.log_ids[-1] if record_id.log_ids else None
+            last_log = record_id.log_ids.sorted(
+                key=lambda r: (not r.lase_click_date, r.lase_click_date)
+            )[-1] if record_id.log_ids else None
             all_user = True if last_log and last_log.done_by == current_user else False
             if last_log:
                 same_name_logs = record_id.log_ids.filtered(

From 6073b8d65dd4ece5d75479a629166b48773d1c49 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 19:54:31 +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

---
 soong_workflow/wizard/soong_workflow_comment_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 38d524aac..473fc09d1 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -779,7 +779,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             is_admin = current_user.has_group('base.group_system')
             # 归档判断
             last_log = record_id.log_ids.sorted(
-                key=lambda r: (not r.lase_click_date, r.lase_click_date)
+                key=lambda r: (not r.lase_click_date, r.lase_click_date or False, r.id)
             )[-1] if record_id.log_ids else None
             all_user = True if last_log and last_log.done_by == current_user else False
             if last_log: