From a1b9684602ab24a3cbb0b43cab68ee1af9f1383d 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, 18 May 2026 18:16:40 +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   | 24 +++++++++++--------
 .../views/property_fee_form_views.xml         |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index b16fe257a..f9d67b26e 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -621,16 +621,20 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
 
         if self.node_btn_name == '加签':
-            current_node_log = self.sudo().env["soong.workflow.log"].search(
-                [
-                    ("model", "=", self.res_model),
-                    ("res_id", "=", self.res_id),
-                    ("done_by", "=", self.env.user.id),
-                    ("node_id", "=", self.node_btn_id.node_id.id),
-                ],
-                order="create_date DESC",
-                limit=1
-            )
+            is_admin = self.env.user.id.has_group('base.group_system')
+            if not is_admin:
+                current_node_log = self.sudo().env["soong.workflow.log"].search(
+                    [
+                        ("model", "=", self.res_model),
+                        ("res_id", "=", self.res_id),
+                        ("done_by", "=", self.env.user.id),
+                        ("node_id", "=", self.node_btn_id.node_id.id),
+                    ],
+                    order="create_date DESC",
+                    limit=1
+                )
+            else:
+                current_node_log = record_id.log_ids[-1]
             current_node_log.write({
                 "comment": self.comment,
                 "approval_state": "2",  # 已完成
diff --git a/yuthon_property_approval/views/property_fee_form_views.xml b/yuthon_property_approval/views/property_fee_form_views.xml
index 9fb93bb5d..84dccba7d 100644
--- a/yuthon_property_approval/views/property_fee_form_views.xml
+++ b/yuthon_property_approval/views/property_fee_form_views.xml
@@ -4,7 +4,7 @@
         <field name="name">property.fee.form.tree</field>
         <field name="model">property.fee.form</field>
         <field name="arch" type="xml">
-            <tree string="费用支出">
+            <tree string="费用支出" default_order="create_date desc">
                 <field name="code" string="流水号"/>
                 <field name="name"/>
                 <field name="company_id1" options="{'no_create': True}"/>