From fc46959c0387e290b4fffc0df9c82281465edf31 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: Thu, 18 Sep 2025 18:14:00 +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/views/soong_workflow_record.xml       |  6 +++---
 .../wizard/soong_workflow_comment_wizard.py          | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 7069facaa..6d164f9ef 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -15,7 +15,7 @@
                     <field name="workflow_id" string="审批类型"/>
                     <field name="text" optional="hide"/>
                     <field name="documents_ids" optional="hide"/>
-                    <filter name="is_start" string="草稿"  domain="[('approve_state', '=', 'start')]"/>
+                    <filter name="is_start" string="草稿"  domain="[('approve_state', '=', 'start')]" />
                     <filter name="is_to_do" string="待办"  domain="[('soong_state', '=', 'to_do')]"/>
                     <group expand="0" string="审批分组">
                         <filter string="审批类型分组" name='group_by_approvals_group_id' context="{'group_by':'approvals_group_id'}"/>
@@ -23,8 +23,8 @@
                     </group>
                     <header_search>
                     <quick_filter string="状态">
-                         <filter string="草稿" name="approve_state" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]"/>
-                         <filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '=', uid)]"/>
+                         <filter string="草稿" name="approve_state" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]" shownumber="1" />
+                         <filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '=', uid)]" shownumber="1" />
                          <filter string="已办" name="done" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '!=', uid)]"/>
                          <filter string="结束" name="end" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]"/>
                     </quick_filter>
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index c26c2400a..d34ec9359 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -181,10 +181,16 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             ('name', '=', link.name),
             ('workflow_id', '=', workflow_id.id)
         ])
-        if node.button_ids[0].name != '转交':
-            button = node.button_ids[-1] if node.button_ids else False
+        if node.button_ids:
+            # 优先找“转交”按钮
+            transfer_btn = next((btn for btn in node.button_ids if btn.name == '转交'), None)
+            if transfer_btn:
+                button = transfer_btn
+            else:
+                # 找不到“转交”再找“结束”
+                button = next((btn for btn in node.button_ids if btn.name == '结束'), None)
         else:
-            button = node.button_ids[0] if node.button_ids else False
+            button = False
         if not button:
             return self.env['hr.employee']