From 2e4870ad5a17c0ae2be1f59df2a068c7a666bdaa 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: Tue, 16 Jun 2026 16:53:33 +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

---
 yuthon_issue/models/issue_library.py       | 2 +-
 yuthon_issue/views/issue_library_views.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index 95079677b..b92a992f1 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -535,7 +535,7 @@ class IssueLibrary(models.Model):
         # 校验选中记录的状态（非草稿不允许提交）
         for i in issue_active_ids:
             if i.issue_state != 'draft':
-                raise UserError("当前状态不允许提交")
+                raise UserError("当前状态不允许提交，请先推送")
 
         # 2. 查找已存在的关联 issue.approval 记录
         existing_approval = self.env['issue.approval'].search([
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 7bc92d536..91bd9e2e8 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -33,8 +33,6 @@
                 <field name="is_push_depart" column_invisible="1"/>
                 <field name="issue_approval_id" column_invisible="1"/>
                 <field name="is_admin" column_invisible="1"/>
-                <button name="depart_push" string="推送" type="object" class="btn btn-blue"
-                        invisible="issue_state != 'to_do'"/>
                 <button name="revoke" string="撤销" type="object" class="btn btn-blue"
                         invisible="issue_state == 'draft'" groups="soong_workflow.group_soong_workflow_manager"/>
                 <button name="issue_cancel" string="取消" type="object" class="btn btn-blue"
@@ -137,6 +135,8 @@
                 <field name="is_push_depart" column_invisible="1"/>
                 <field name="issue_approval_id" column_invisible="1"/>
                 <field name="is_admin" column_invisible="1"/>
+                <button name="depart_push" string="推送" type="object" class="btn btn-blue"
+                        invisible="issue_state != 'to_do'"/>
                 <!--                <button name="single_issue_pull" string="提交" type="object" class="oe_highligh"/>-->
                 <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
                         invisible="not issue_approval_id"/>
@@ -1056,7 +1056,7 @@
         <field name="name">部门议题库</field>
         <field name="res_model">issue.library</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('member_of_department', '=', True), ('is_push_depart', '=', True)]</field>
+        <field name="domain">[('member_of_department', '=', True)]</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_department_tree')})]"/>
     </record>