From 45adea0f0303b048ed616bff2c4d775c8ad8e0ed 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, 23 Apr 2026 16:29:16 +0800
Subject: [PATCH 01/15] =?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

---
 .../templates/soong_workflow_templates.xml     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index cf2f0ed07..ed11c759d 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -34,8 +34,13 @@
                 <field name="soong_record_ids" style="width:100%; margin-top: 10px;">
                     <tree create="1" edit="1" delete="1" editable="bottom" type="object">
                         <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                        <field name="workflow_record_id" domain="[('member_of_department', '=', True), ('approvals_group_id.name', 'not in', ['考勤', '人事'])]"
-                               required="1" options="{'no_open': True}" context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
+                        <field name="workflow_record_id"
+                           domain="['|',
+                                    ('member_of_department', '=', True),
+                                    ('users_ids', 'in', [uid])]"
+                           required="1"
+                           options="{'no_open': True}"
+                           context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
                         <field name="code" column_invisible="1"/>
                         <field name="workflow_id"/>
                         <field name="create_uid"/>
@@ -92,8 +97,13 @@
                 <field name="soong_record_ids" style="width:100%%; margin-top: 10px;">
                     <tree editable="bottom" delete="False">
                         <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                      <field name="workflow_record_id" domain="[('member_of_department', '=', True), ('approvals_group_id.name', 'not in', ['考勤', '人事'])]"
-                               required="1" options="{'no_open': True}" context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
+                      <field name="workflow_record_id"
+                           domain="['|',
+                                    ('member_of_department', '=', True),
+                                    ('users_ids', 'in', [uid])]"
+                           required="1"
+                           options="{'no_open': True}"
+                           context="{'tree_view_ref': 'soong_workflow.soong_workflow_record_no_action_tree'}"/>
                         <field name="code" column_invisible="1"/>
                         <field name="workflow_id"/>
                         <field name="create_uid"/>

From 1da1944181a8273cb62f591bffa10a228af45454 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, 23 Apr 2026 17:51:04 +0800
Subject: [PATCH 02/15] =?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

---
 yuthon_notice/models/yuthon_notice.py | 34 +++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index c95a282d7..b60847d06 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -135,10 +135,11 @@ class YuthonNotice(models.Model):
             notice.with_context(skip_constrains=True).users_ids = [(6, 0, list(all_users))]
 
             if notice.users_ids and notice.is_change_notice:
-                conf_old = self.env['yuthon.confirm.users'].search([('notice_id', '=', notice.id)])
+                conf_old = self.env['yuthon.confirm.users'].sudo().search([('notice_id', '=', notice.id)])
                 old_employee_ids = conf_old.mapped('employee_id.id')
-                new_employee_ids = notice.users_ids.mapped('employee_ids.id')
-
+                new_employee_ids = self.env['hr.employee'].sudo().search([
+                    ('user_id', 'in', notice.users_ids.ids)
+                ]).ids
                 add_employee_ids = list(set(new_employee_ids) - set(old_employee_ids))
                 del_employee_ids = list(set(old_employee_ids) - set(new_employee_ids))
 
@@ -148,11 +149,13 @@ class YuthonNotice(models.Model):
                     del_conf.unlink()
 
                 if add_employee_ids:
-                    # add_users = self.users_ids.filtered(lambda u: u.employee_ids[0].id in add_employee_ids)
-                    for user in self.users_ids:
+                    all_employees = self.env['hr.employee'].sudo().search([
+                        ('user_id', 'in', self.users_ids.ids)
+                    ])
+                    for employee in all_employees:
                         self.env['yuthon.confirm.users'].create({
                             'notice_id': self.id,
-                            'employee_id': user.employee_id.id,
+                            'employee_id': employee.id,
                             'notice_code': self.code,
                             'notice_name': self.name,
                             'release_date': self.create_date1,
@@ -198,9 +201,9 @@ class YuthonNotice(models.Model):
         self.ensure_one()
         if self.is_change_notice:
             self.notice_state = 'yes'
-            conf_old = self.env['yuthon.confirm.users'].search([
+            conf_old = self.env['yuthon.confirm.users'].sudo().search([
                 ('notice_id', '=', self.id),
-                ('employee_id', 'in', self.users_ids.mapped('employee_ids.id'))
+                ('employee_id.user_id', 'in', self.users_ids.ids)
             ])
             if conf_old:
                 conf_old.write({'state': 'no'})
@@ -210,36 +213,33 @@ class YuthonNotice(models.Model):
                 if not employee:
                     continue
                 url = f'https://phone.thtzjt.com/phone/Notice/{self.id}?employee_id={employee.id}'
-
                 result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard(
                     category='notice',
-                    touser=user_id.employee_ids.wecom_userid,
+                    touser=employee.wecom_userid,
                     title="通知公告",
-                    description=f"{self.name} 发布人: {self.users_id.name}",
+                    description=f"{self.name} 发布人: {self.users_id.name if self.users_id else ''}",
                     url=url,
                     btntxt="详细信息"
                 )
-
                 msg_id = None
                 if result_data:
                     res_dict = result_data[1]
                     msg_id = res_dict.get('msgid')
-
                 user_wecom_mapping.append({
                     'emp_id': employee.id,
                     'msg_id': msg_id
                 })
-
             for mapping in user_wecom_mapping:
                 emp_id = mapping['emp_id']
                 msg_id = mapping['msg_id']
-                is_exist = self.env['yuthon.confirm.users'].search([
+                is_exist = self.env['yuthon.confirm.users'].sudo().search([
                     ('notice_id', '=', self.id),
                     ('notice_code', '=', self.code),
                     ('employee_id', '=', emp_id)
                 ], limit=1)
+
                 if not is_exist:
-                    self.env['yuthon.confirm.users'].create({
+                    self.env['yuthon.confirm.users'].sudo().create({
                         'notice_id': self.id,
                         'employee_id': emp_id,
                         'notice_code': self.code,
@@ -249,7 +249,7 @@ class YuthonNotice(models.Model):
                         'msg_id': msg_id,
                     })
                 else:
-                    is_exist.write({
+                    is_exist.sudo().write({
                         'state': 'no',
                         'msg_id': msg_id,
                     })

From b821e5c3c71572cb4136098f3c3275ce4a46b27e 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, 23 Apr 2026 19:22:20 +0800
Subject: [PATCH 03/15] =?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_node.py  |  1 +
 .../views/soong_workflow_node_views.xml       |  1 +
 .../wizard/soong_workflow_comment_wizard.py   | 34 ++++++++++++++++++-
 yuthon_notice/models/yuthon_notice.py         |  1 -
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py
index 71ffa25c7..0e06899e9 100644
--- a/soong_workflow/models/soong_workflow_node.py
+++ b/soong_workflow/models/soong_workflow_node.py
@@ -107,6 +107,7 @@ class SoongWorkflowNode(models.Model):
         ('next', '跳过下一个相同人员节点'),
         ('prev', '跳过上一个相同人员节点'),
     ], string='相同人员节点处理', default='none')
+    is_mandatory_node = fields.Boolean(string="必经节点", default=False)
 
     @api.onchange("is_apostille")
     def onchange_is_apostille(self):
diff --git a/soong_workflow/views/soong_workflow_node_views.xml b/soong_workflow/views/soong_workflow_node_views.xml
index 11a668c0f..82f6f1de2 100644
--- a/soong_workflow/views/soong_workflow_node_views.xml
+++ b/soong_workflow/views/soong_workflow_node_views.xml
@@ -17,6 +17,7 @@
                             <field name="return_comment_id"/>
                             <field name="confirm_comment_id"/>
                             <field name="end_comment_id"/>
+                            <field name="is_mandatory_node"/>
                             <field name="same_user_skip_type"/>
                             <field name="illustrate"/>
                         </group>
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 43a71bdfc..dcd9a548c 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -206,13 +206,45 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     @api.onchange('trans_link_id')
     def onchange_trans_employee_ids(self):
         for record in self:
+            record_id = self.env[record.res_model].browse(record.res_id) if record.res_model and record.res_id else None
+            ctx_links = self.env.context.get('all_workflow_links', [])
+            all_links = self.env['trans.link'].browse(ctx_links) if isinstance(ctx_links, (list, tuple)) else ctx_links
+
+            valid_links = all_links - record.invalid_link_ids
+
             record.is_selection = False
             record.is_this_company = True
             if record.node_btn_id.employee_ids and record.node_btn_id.is_carbon_copy:
                 record.circulated_employee_ids = record.node_btn_id.employee_ids
+
+            if not record_id or not record_id.workflow_id:
+                continue
+            # 排除规则：存在 node_btn_name == '1' 直接放行不限制
+            has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
+            if has_exclude_log:
+                continue
+            # 1. 拿到所有必经节点
+            mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
+            if not mandatory_nodes:
+                return
+            # 取第一个必经节点
+            first_mandatory_node = mandatory_nodes[0]
+            # 2. 只允许选择：顺序 <= 必经节点的链接
+            allow_links = self.env['trans.link']
+            for link in valid_links:
+                link_node = record_id.workflow_id.node_ids.search([
+                    ('name', '=', link.name),
+                    ('workflow_id', '=', record_id.workflow_id.id)
+                ], limit=1)
+                if link_node and link_node.sequence <= first_mandatory_node.sequence:
+                    allow_links |= link
+
+            if record.trans_link_id and record.trans_link_id not in allow_links:
+                record.trans_link_id = False
+                raise UserError(f"当前节点【{first_mandatory_node.name}】，不可选择必经节点之后的流程节点！")
+
             if not record.trans_link_id:
                 continue
-            record_id = self.env[record.res_model].browse(record.res_id) if record.res_model and record.res_id else None
             for link in record.trans_link_id:
                 employee_user_role_ids = self.env['hr.employee']
                 if link.name == '印章管理员':
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index b60847d06..02ee5b840 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -237,7 +237,6 @@ class YuthonNotice(models.Model):
                     ('notice_code', '=', self.code),
                     ('employee_id', '=', emp_id)
                 ], limit=1)
-
                 if not is_exist:
                     self.env['yuthon.confirm.users'].sudo().create({
                         'notice_id': self.id,

From 99740dc2cf0d7992036579e74233019ce3c7aa25 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, 23 Apr 2026 19:23:14 +0800
Subject: [PATCH 04/15] =?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 dcd9a548c..7ada98a92 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -241,7 +241,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             if record.trans_link_id and record.trans_link_id not in allow_links:
                 record.trans_link_id = False
-                raise UserError(f"当前节点【{first_mandatory_node.name}】，不可选择必经节点之后的流程节点！")
+                raise UserError(f"节点【{first_mandatory_node.name}】是必经节点，不可选择必经节点之后的流程节点！")
 
             if not record.trans_link_id:
                 continue

From 46ffa0a9f014a3b407213778f98667298619e26d 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, 23 Apr 2026 19:51:50 +0800
Subject: [PATCH 05/15] =?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 +-
 yuthon_hr_employee/models/yuthon_hr_employee.py        | 2 +-
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 7ada98a92..f86b5fca0 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -219,7 +219,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             if not record_id or not record_id.workflow_id:
                 continue
-            # 排除规则：存在 node_btn_name == '1' 直接放行不限制
+            # 排除规则：存在流程退回 直接放行不限制
             has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
             if has_exclude_log:
                 continue
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index af39090d4..eec20a72e 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -26,7 +26,7 @@ class YuthonHrEmployee(models.Model):
     对原模型数据的隐藏，字段的开发和添加
     """
     _inherit = "hr.employee"
-    _order = 'user_number asc'
+    _order = 'number asc'
 
     # name = fields.CharWithPinyin(default_export_compatible=True)
     user_role_ids_changed = fields.Boolean(string="xxx")  # bug
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index c7a92cd7c..928360b4e 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -589,7 +589,7 @@
         <field name="name">hr.employee.member</field>
         <field name="model">hr.employee</field>
         <field name="arch" type="xml">
-            <tree string="会员列表" create="false" delete="false" editable="bottom">
+            <tree string="会员列表" create="false" delete="false" editable="bottom" default_order="number asc">
                 <field name="name" readonly="1"/>
                 <field name="work_phone" readonly="1"/>
                 <field name="department_id" readonly="1" options='{"no_open": True, "no_create": True}'/>

From a60143651d9306110541077644bc07eb90479587 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, 23 Apr 2026 20:02:10 +0800
Subject: [PATCH 06/15] =?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

---
 yuthon_issue/models/inherit_room_booking.py | 15 ++++++++++-----
 yuthon_notice/views/yuthon_notice_views.xml |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py
index c24a1157d..1f72f07fb 100644
--- a/yuthon_issue/models/inherit_room_booking.py
+++ b/yuthon_issue/models/inherit_room_booking.py
@@ -99,11 +99,16 @@ class RoomBooking(models.Model):
                                 meet.issue_library_id.issue_state = False
 
                         if self.code:
-                            self.env['issue.library.approval.line'].create({
-                                'issue_library_id': meet.issue_library_id.id,
-                                'code': self.code,
-                                'approval_date': fields.Datetime.now() + timedelta(hours=8),
-                            })
+                            exists = self.env['issue.library.approval.line'].search([
+                                ('issue_library_id', '=', meet.issue_library_id.id),
+                                ('code', '=', self.code)
+                            ], limit=1)
+                            if not exists:
+                                self.env['issue.library.approval.line'].create({
+                                    'issue_library_id': meet.issue_library_id.id,
+                                    'code': self.code,
+                                    'approval_date': fields.Datetime.now() + timedelta(hours=8),
+                                })
 
     @api.depends_context('uid', 'company')
     @api.depends('company_id')
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index a931a9c7d..93e2b56fa 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="公告管理" decoration-success="notice_state == 'yes'"
                   decoration-info="notice_state == 'no'"
-                  decoration-muted="notice_state == 'stop'">
+                  decoration-muted="notice_state == 'stop'" default_order="create_date1 desc">
                 <field name="name" required="1"/>
                 <field name="notice_type_id" string="类型" class="list_ids_width"/>
                 <field name="users_id" string="发布人" class="list_ids_width"/>
@@ -122,7 +122,7 @@
             <tree string="公告管理" edit="false" delete="false" create="false"
                   decoration-danger="is_notice_roger == 'no'"
                   decoration-success="is_notice_roger == 'yes'"
-                  js_class="custom_notice_tree_button">
+                  js_class="custom_notice_tree_button" default_order="create_date1 desc">
                 <field name="name"/>
                 <field name="notice_type_id" string="类型"/>
                 <field name="users_id" string="发布人" class="list_ids_width"/>

From 2e99dbe9bd42b99b51b6173ef38e44ec78268ee7 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, 23 Apr 2026 20:19:21 +0800
Subject: [PATCH 07/15] =?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   | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index f86b5fca0..8ab8e627c 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -217,34 +217,30 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             if record.node_btn_id.employee_ids and record.node_btn_id.is_carbon_copy:
                 record.circulated_employee_ids = record.node_btn_id.employee_ids
 
-            if not record_id or not record_id.workflow_id:
-                continue
-            # 排除规则：存在流程退回 直接放行不限制
-            has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
-            if has_exclude_log:
-                continue
-            # 1. 拿到所有必经节点
-            mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
-            if not mandatory_nodes:
-                return
-            # 取第一个必经节点
-            first_mandatory_node = mandatory_nodes[0]
-            # 2. 只允许选择：顺序 <= 必经节点的链接
-            allow_links = self.env['trans.link']
-            for link in valid_links:
-                link_node = record_id.workflow_id.node_ids.search([
-                    ('name', '=', link.name),
-                    ('workflow_id', '=', record_id.workflow_id.id)
-                ], limit=1)
-                if link_node and link_node.sequence <= first_mandatory_node.sequence:
-                    allow_links |= link
-
-            if record.trans_link_id and record.trans_link_id not in allow_links:
-                record.trans_link_id = False
-                raise UserError(f"节点【{first_mandatory_node.name}】是必经节点，不可选择必经节点之后的流程节点！")
-
             if not record.trans_link_id:
                 continue
+
+            if record_id and record_id.workflow_id:
+                has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
+                if not has_exclude_log:
+                    mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
+                    if mandatory_nodes:
+                        first_mandatory_node = mandatory_nodes[0]
+                        allow_links = self.env['trans.link']
+                        for link in valid_links:
+                            link_node = record_id.workflow_id.node_ids.search([
+                                ('name', '=', link.name),
+                                ('workflow_id', '=', record_id.workflow_id.id)
+                            ], limit=1)
+                            if link_node and link_node.sequence <= first_mandatory_node.sequence:
+                                allow_links |= link
+
+                        # 只做判断：选了非法的才报错
+                        if record.trans_link_id and record.trans_link_id not in allow_links:
+                            record.trans_link_id = False
+                            raise UserError(
+                                f"节点【{first_mandatory_node.name}】是必经节点，不可选择必经节点之后的流程节点！")
+
             for link in record.trans_link_id:
                 employee_user_role_ids = self.env['hr.employee']
                 if link.name == '印章管理员':

From 6420692d9278d2a049317b485979d77aecaee85b 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, 23 Apr 2026 20:27:47 +0800
Subject: [PATCH 08/15] =?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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 8ab8e627c..148387240 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -213,16 +213,20 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             valid_links = all_links - record.invalid_link_ids
 
             record.is_selection = False
-            record.is_this_company = True
+            if self.node_btn_name == '退回':
+                record.is_this_company = False
+            else:
+                record.is_this_company = True
             if record.node_btn_id.employee_ids and record.node_btn_id.is_carbon_copy:
                 record.circulated_employee_ids = record.node_btn_id.employee_ids
 
             if not record.trans_link_id:
                 continue
-
+            # 排除规则：存在流程退回 直接放行不限制
             if record_id and record_id.workflow_id:
                 has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
                 if not has_exclude_log:
+                    # 2. 只允许选择：顺序 <= 必经节点的链接
                     mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
                     if mandatory_nodes:
                         first_mandatory_node = mandatory_nodes[0]

From 6cc6340001155d5cbb9a975670cf63be91713f91 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, 24 Apr 2026 09:55:16 +0800
Subject: [PATCH 09/15] =?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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 148387240..529664230 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -226,10 +226,12 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             if record_id and record_id.workflow_id:
                 has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
                 if not has_exclude_log:
-                    # 2. 只允许选择：顺序 <= 必经节点的链接
                     mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
                     if mandatory_nodes:
                         first_mandatory_node = mandatory_nodes[0]
+                        # 如果当前节点就是必经节点，不再限制选择
+                        if record.node_id.id == first_mandatory_node.id:
+                            continue
                         allow_links = self.env['trans.link']
                         for link in valid_links:
                             link_node = record_id.workflow_id.node_ids.search([
@@ -239,7 +241,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                             if link_node and link_node.sequence <= first_mandatory_node.sequence:
                                 allow_links |= link
 
-                        # 只做判断：选了非法的才报错
                         if record.trans_link_id and record.trans_link_id not in allow_links:
                             record.trans_link_id = False
                             raise UserError(

From 1df02244672a2f2c73896148d9d8bf6c7f6787ab 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, 24 Apr 2026 10:24:02 +0800
Subject: [PATCH 10/15] =?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   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 529664230..aee5d89ec 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -203,7 +203,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             record.invalid_link_ids = invalid_links
 
-    @api.onchange('trans_link_id')
+    @api.onchange('trans_employee_ids')
     def onchange_trans_employee_ids(self):
         for record in self:
             record_id = self.env[record.res_model].browse(record.res_id) if record.res_model and record.res_id else None
@@ -222,29 +222,38 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             if not record.trans_link_id:
                 continue
-            # 排除规则：存在流程退回 直接放行不限制
+
+            # 排除规则：流程退回 不限制
             if record_id and record_id.workflow_id:
                 has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
                 if not has_exclude_log:
-                    mandatory_nodes = record_id.workflow_id.node_ids.filtered(lambda n: n.is_mandatory_node)
-                    if mandatory_nodes:
-                        first_mandatory_node = mandatory_nodes[0]
-                        # 如果当前节点就是必经节点，不再限制选择
-                        if record.node_id.id == first_mandatory_node.id:
-                            continue
-                        allow_links = self.env['trans.link']
-                        for link in valid_links:
-                            link_node = record_id.workflow_id.node_ids.search([
-                                ('name', '=', link.name),
-                                ('workflow_id', '=', record_id.workflow_id.id)
-                            ], limit=1)
-                            if link_node and link_node.sequence <= first_mandatory_node.sequence:
-                                allow_links |= link
+                    # 1. 从 valid_links 里 匹配出 当前流程会经过的【必经节点】
+                    current_mandatory_nodes = self.env['workflow.node']
+                    for link in valid_links:
+                        link_node = record_id.workflow_id.node_ids.search([
+                            ('name', '=', link.name),
+                            ('workflow_id', '=', record_id.workflow_id.id)
+                        ], limit=1)
+                        if link_node and link_node.is_mandatory_node:
+                            current_mandatory_nodes |= link_node
+                    if not current_mandatory_nodes:
+                        continue
+                    # 2. 取第一个必经节点
+                    first_mandatory = current_mandatory_nodes.sorted('sequence')[0]
+                    # 3. 只允许选择 <= 第一个必经节点 的链接
+                    allow_links = self.env['trans.link']
+                    for link in valid_links:
+                        link_node = record_id.workflow_id.node_ids.search([
+                            ('name', '=', link.name),
+                            ('workflow_id', '=', record_id.workflow_id.id)
+                        ], limit=1)
+                        if link_node and link_node.sequence <= first_mandatory.sequence:
+                            allow_links |= link
 
-                        if record.trans_link_id and record.trans_link_id not in allow_links:
-                            record.trans_link_id = False
-                            raise UserError(
-                                f"节点【{first_mandatory_node.name}】是必经节点，不可选择必经节点之后的流程节点！")
+                    # 4. 校验：选了必经节点之后的 → 报错
+                    if record.trans_link_id not in allow_links:
+                        record.trans_link_id = False
+                        raise UserError(f"节点【{first_mandatory.name}】是必经节点，不可跳过！")
 
             for link in record.trans_link_id:
                 employee_user_role_ids = self.env['hr.employee']

From 130eaa9cdfd82715361fe13cd839c836c4fc2ace 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, 24 Apr 2026 10:28:36 +0800
Subject: [PATCH 11/15] =?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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index aee5d89ec..08d933f9b 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -203,7 +203,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
             record.invalid_link_ids = invalid_links
 
-    @api.onchange('trans_employee_ids')
+    @api.onchange('trans_link_id')
     def onchange_trans_employee_ids(self):
         for record in self:
             record_id = self.env[record.res_model].browse(record.res_id) if record.res_model and record.res_id else None
@@ -228,7 +228,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 has_exclude_log = record_id.log_ids.filtered(lambda l: l.node_btn_name == '1')
                 if not has_exclude_log:
                     # 1. 从 valid_links 里 匹配出 当前流程会经过的【必经节点】
-                    current_mandatory_nodes = self.env['workflow.node']
+                    current_mandatory_nodes = self.env['soong.workflow.node']
                     for link in valid_links:
                         link_node = record_id.workflow_id.node_ids.search([
                             ('name', '=', link.name),
@@ -236,6 +236,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         ], limit=1)
                         if link_node and link_node.is_mandatory_node:
                             current_mandatory_nodes |= link_node
+
                     if not current_mandatory_nodes:
                         continue
                     # 2. 取第一个必经节点

From a58176acde70f452d95b3c3b9b0115ad1cc93f71 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, 24 Apr 2026 10:32:15 +0800
Subject: [PATCH 12/15] =?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   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 08d933f9b..ba1a939ce 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -237,24 +237,23 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         if link_node and link_node.is_mandatory_node:
                             current_mandatory_nodes |= link_node
 
-                    if not current_mandatory_nodes:
-                        continue
+                    if current_mandatory_nodes:
                     # 2. 取第一个必经节点
-                    first_mandatory = current_mandatory_nodes.sorted('sequence')[0]
-                    # 3. 只允许选择 <= 第一个必经节点 的链接
-                    allow_links = self.env['trans.link']
-                    for link in valid_links:
-                        link_node = record_id.workflow_id.node_ids.search([
-                            ('name', '=', link.name),
-                            ('workflow_id', '=', record_id.workflow_id.id)
-                        ], limit=1)
-                        if link_node and link_node.sequence <= first_mandatory.sequence:
-                            allow_links |= link
+                        first_mandatory = current_mandatory_nodes.sorted('sequence')[0]
+                        # 3. 只允许选择 <= 第一个必经节点 的链接
+                        allow_links = self.env['trans.link']
+                        for link in valid_links:
+                            link_node = record_id.workflow_id.node_ids.search([
+                                ('name', '=', link.name),
+                                ('workflow_id', '=', record_id.workflow_id.id)
+                            ], limit=1)
+                            if link_node and link_node.sequence <= first_mandatory.sequence:
+                                allow_links |= link
 
-                    # 4. 校验：选了必经节点之后的 → 报错
-                    if record.trans_link_id not in allow_links:
-                        record.trans_link_id = False
-                        raise UserError(f"节点【{first_mandatory.name}】是必经节点，不可跳过！")
+                        # 4. 校验：选了必经节点之后的 → 报错
+                        if record.trans_link_id not in allow_links:
+                            record.trans_link_id = False
+                            raise UserError(f"节点【{first_mandatory.name}】是必经节点，不可跳过！")
 
             for link in record.trans_link_id:
                 employee_user_role_ids = self.env['hr.employee']

From f99db8a80957612cadc494c4622ab3c54f894b13 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, 24 Apr 2026 11:13:26 +0800
Subject: [PATCH 13/15] =?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

---
 yuthon_issue/views/inherit_room_booking.xml                | 2 +-
 yuthon_property_approval/models/inherit_yuthon_property.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml
index 225d5b290..9a3462d90 100644
--- a/yuthon_issue/views/inherit_room_booking.xml
+++ b/yuthon_issue/views/inherit_room_booking.xml
@@ -29,7 +29,7 @@
                             <button name="open_record" type="object" string="详情" class="oe_highlight"/>
                             <field name="sequence" widget="handle"/>
                             <field name="meeting_booking_id" column_invisible="1"/>
-                            <field name="issue_library_text"/>
+                            <field name="issue_library_id"/>
                             <field name="employee_id" options="{'no_create': True}"/>
                             <field name="attendees_ids" widget="many2many_tags" options="{'no_create': True}"/>
                             <field name="users_role_group_ids" widget="many2many_tags" options="{'no_create': True}"/>
diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py
index f0181a29e..5e6bbd195 100644
--- a/yuthon_property_approval/models/inherit_yuthon_property.py
+++ b/yuthon_property_approval/models/inherit_yuthon_property.py
@@ -952,7 +952,7 @@ class PropertyAccountsReceivable(models.Model):
     @api.depends('contract_id')
     def _compute_property_name(self):
         for record in self:
-            record.property_name = record.contract_id.property_name
+            record.property_name = record.contract_id.use_address
 
     @api.depends('property_ids')
     def _compute_title_deed(self):

From 89d34f57fdd7fbb832c019caef78767411771414 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, 24 Apr 2026 11:34:36 +0800
Subject: [PATCH 14/15] =?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

---
 .../models/property_bills_list.py             |  8 ++++++
 .../models/property_lease_renewal.py          | 14 +++++-----
 .../views/property_bills_list_views.xml       | 26 +++++++++++++++++--
 .../wizard/property_bills_wizard.py           |  1 +
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/yuthon_property_approval/models/property_bills_list.py b/yuthon_property_approval/models/property_bills_list.py
index 6ec98bd4b..dbc315191 100644
--- a/yuthon_property_approval/models/property_bills_list.py
+++ b/yuthon_property_approval/models/property_bills_list.py
@@ -19,6 +19,14 @@ class PropertyBillsList(models.Model):
     workflow_record_id = fields.Many2one('soong.workflow.record', string="流程")
     fee_id = fields.Many2one('property.fee.form', string="费用")
     remake = fields.Text(string="备注")
+    pay_state = fields.Selection([('unpaid', '待付'), ('paid', '已付')], string="支付状态", default="unpaid")
+
+    def update_pay_state(self):
+        bills_ids = self.env["property.bills.list"].browse(
+            self._context.get('active_ids', self._context.get('active_id')))
+        for record in bills_ids:
+            if record.actual_date:
+                record.pay_state = 'paid'
 
     def update_lessor_id(self):
         bills_ids = self.env["property.bills.list"].browse(
diff --git a/yuthon_property_approval/models/property_lease_renewal.py b/yuthon_property_approval/models/property_lease_renewal.py
index e552303f2..27f1c5094 100644
--- a/yuthon_property_approval/models/property_lease_renewal.py
+++ b/yuthon_property_approval/models/property_lease_renewal.py
@@ -213,13 +213,6 @@ class PropertyLeaseRenewal(models.Model):
                 elif lessor_id.referred in ['天河粮储']:
                     company_id = self.env['res.company'].search([('name', '=', '天河粮储')], limit=1)
 
-                bank_accounts = self.env['property.bank.line'].search([
-                    ('tenant_id', '=', rec.lessee_id.id)
-                ]).mapped('bank')
-                bank_accounts = [acc for acc in bank_accounts if acc][0]
-                rec.contract_id.write({
-                    'actual_end_time': rec.early_quitting_date
-                })
                 if not rec.is_full_refund:
                     penalty_amount = rec.deposit - rec.refund_amount - rec.total_receivables
                     if penalty_amount > 0:
@@ -292,6 +285,13 @@ class PropertyLeaseRenewal(models.Model):
                             ('workflow_record_id', '=', workflow_record_id.id),
                         ], limit=1)
                         if not existing_bank_statement:
+                            bank_accounts = self.env['property.bank.line'].search([
+                                ('tenant_id', '=', rec.lessee_id.id)
+                            ]).mapped('bank')
+                            bank_accounts = [acc for acc in bank_accounts if acc][0]
+                            rec.contract_id.write({
+                                'actual_end_time': rec.early_quitting_date
+                            })
                             bank_id = self.env['property.bank.statements'].sudo().create({
                                 'start_time': start_time,
                                 'name': bank_accounts,
diff --git a/yuthon_property_approval/views/property_bills_list_views.xml b/yuthon_property_approval/views/property_bills_list_views.xml
index 49a89742b..665911a3d 100644
--- a/yuthon_property_approval/views/property_bills_list_views.xml
+++ b/yuthon_property_approval/views/property_bills_list_views.xml
@@ -4,7 +4,7 @@
         <field name="name">property.bills.list.tree</field>
         <field name="model">property.bills.list</field>
         <field name="arch" type="xml">
-            <tree string="应收账单" editable="bottom">
+            <tree string="应收账单" editable="bottom" default_order="due_date desc">
                 <field name="due_date"/>
                 <field name="actual_date"/>
                 <field name="management_type_id"/>
@@ -24,10 +24,25 @@
             </tree>
         </field>
     </record>
+   <record id="view_property_bills_list_search" model="ir.ui.view">
+    <field name="name">property.bills.list.search</field>
+    <field name="model">property.bills.list</field>
+    <field name="arch" type="xml">
+            <search>
+                <field name="contract_id"/>
+                <field name="property_name"/>
+                <field name="lessee_id"/>
+                <group expand="0" string="分组">
+                    <filter string="状态" name="group_pay_state" context="{'group_by':'pay_state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
     <record id="view_property_bills_list_action" model="ir.actions.act_window">
             <field name="name">应收账单</field>
             <field name="res_model">property.bills.list</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,search</field>
+            <field name="context">{'search_default_group_pay_state': 1}</field>
     </record>
     <record id="all_update_lessor_id" model="ir.actions.server">
         <field name="name">更新支付公司</field>
@@ -36,6 +51,13 @@
         <field name="state">code</field>
         <field name="code">action = model.update_lessor_id()</field>
     </record>
+    <record id="all_update_pay_state" model="ir.actions.server">
+        <field name="name">一次性</field>
+        <field name="model_id" ref="yuthon_property_approval.model_property_bills_list"/>
+        <field name="binding_model_id" ref="yuthon_property_approval.model_property_bills_list"/>
+        <field name="state">code</field>
+        <field name="code">action = model.update_pay_state()</field>
+    </record>
 </odoo>
 
 
diff --git a/yuthon_property_approval/wizard/property_bills_wizard.py b/yuthon_property_approval/wizard/property_bills_wizard.py
index 38b4f4b93..645f5fd9e 100644
--- a/yuthon_property_approval/wizard/property_bills_wizard.py
+++ b/yuthon_property_approval/wizard/property_bills_wizard.py
@@ -23,6 +23,7 @@ class PropertyBillsWizard(models.TransientModel):
 
         if self.actual_date:
             self.bills_list_id.actual_date = self.actual_date
+            self.bills_list_id.pay_state = 'paid'
             receivable = self.env['property.accounts.receivable'].search([('contract_id', '=', self.bills_list_id.contract_id.id),
                                                                           ('management_type_id', '=', self.bills_list_i.management_type_id.id)
                                                                           ])

From b48af3a52d7b5a5716fba75fd9bddf35123bf553 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, 24 Apr 2026 14:56:32 +0800
Subject: [PATCH 15/15] =?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 | 1 +
 yuthon_issue/views/issue_meeting_minutes_views.xml     | 2 +-
 yuthon_salary/models/yuthon_salary_active.py           | 1 +
 yuthon_salary/views/yuthon_salary_active_views.xml     | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index ba1a939ce..ae59dd19d 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -1117,6 +1117,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
             if self.res_model == 'purchase.order':
                 record.write({'purchase_state': 'done'})
             record.log_ids[-1].write({'is_active_operate': True,
+                                      'lase_click_date': fields.Datetime.now(),
                                       'approval_state': '1'
                                       })
             workflow_record_id = self.env['soong.workflow.record'].sudo().search([('res_id', '=', record_id.id),
diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml
index f8a7e97b9..8e2b70a7d 100644
--- a/yuthon_issue/views/issue_meeting_minutes_views.xml
+++ b/yuthon_issue/views/issue_meeting_minutes_views.xml
@@ -4,7 +4,7 @@
         <field name="name">issue.meeting.minutes.tree</field>
         <field name="model">issue.meeting.minutes</field>
         <field name="arch" type="xml">
-            <tree string="会议纪要">
+            <tree string="会议纪要" default_order="meeting_date desc">
                 <field name="meeting_id"/>
                 <field name="code"/>
                 <field name="meeting_type_id"/>
diff --git a/yuthon_salary/models/yuthon_salary_active.py b/yuthon_salary/models/yuthon_salary_active.py
index ce9cb97b7..093914bc0 100644
--- a/yuthon_salary/models/yuthon_salary_active.py
+++ b/yuthon_salary/models/yuthon_salary_active.py
@@ -90,6 +90,7 @@ class YuthonSalaryActive(models.Model):
     one_year_sum = fields.Float(string='一次性年终奖应发合计')
     one_year_tax = fields.Float(string='一次性年终奖计税')
     one_year_net = fields.Float(string='一次性年终奖实发')
+    enterprise_promotion_bonus_2025 = fields.Float(string='2025年企业宣传奖励')
     insurance = fields.Float(string='保险', compute='_compute_insurance')
 
     @api.depends("basic_endowment_insurance", "basic_medical_insurance", "unemployment_insurance",)
diff --git a/yuthon_salary/views/yuthon_salary_active_views.xml b/yuthon_salary/views/yuthon_salary_active_views.xml
index 6e1a5a69f..6dd733b1c 100644
--- a/yuthon_salary/views/yuthon_salary_active_views.xml
+++ b/yuthon_salary/views/yuthon_salary_active_views.xml
@@ -70,6 +70,7 @@
                 <field name="balance_salary" string="2025年结余工资"/>
                 <field name="liquidation_salary_staff" string="2024年清算工资（职工）"/>
                 <field name="business_special_bonus" string="2025经营特别奖"/>
+                <field name="enterprise_promotion_bonus_2025" string="2025企业宣传奖励"/>
                 <field name="business_base" string="2025年基础年终奖"/>
                 <field name="one_year_sum" string="一次性年终奖应发合计"/>
                 <field name="one_year_tax" string="一次性年终奖计税"/>