From d95adb2f721264e18446c22af723381b89f36bd8 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 15:30:36 +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 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index a526a0c93..d64865259 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -134,13 +134,9 @@ class SoongWorkflowMixin(models.AbstractModel):
             lg1 = record.log_ids.search(domain)
             if lg2 or lg1:
                 record.is_confirm = False
-            if not lg1 and not lg2 and record.is_active == True:
+            if not lg1 and not lg2:
                 record.is_end = False
 
-            if record.log_ids:
-                if record.log_ids[-1].name == '归档' and record.log_ids[-1].approval_state == '2':
-                    record.is_end = True
-
     @api.depends("node_id", "log_ids")
     def _compute_approval_sign_ids(self):
         for record in self:
@@ -878,7 +874,7 @@ class SoongWorkflowMixin(models.AbstractModel):
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")
                             id_el.set("invisible", "1")
-                            invisible += "or is_end"
+                            invisible += "or not is_end"
                         if button.name == "退回":
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")

From 6893684ae8d5236035ba4ebdabfccc7e3e62cab6 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 15:31:21 +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/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 d64865259..a39492661 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -129,7 +129,7 @@ class SoongWorkflowMixin(models.AbstractModel):
             record.is_confirm = True
             record.is_end = True
             domain = [('done_by', '=', self.env.user.id), ('workflow_id', '=', record.workflow_id.id),
-                      ('res_id', '=', record.id), ('approval_state', 'in', ['0', '1']), ('name', '!=', '归档')]
+                      ('res_id', '=', record.id), ('approval_state', 'not in', ['0', '1']), ('name', '!=', '归档')]
             lg2 = record.log_ids2.search(domain)
             lg1 = record.log_ids.search(domain)
             if lg2 or lg1: