From bfe596006c926b7270a82c93ae9ded415b73710f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Fri, 21 Feb 2025 18:02:08 +0800
Subject: [PATCH] 1

---
 yuthon_notice/__manifest__.py                 |  2 ++
 yuthon_notice/data/notice_type_data.xml       |  7 +++++++
 .../security/yuthon_notice_group.xml          |  4 ++--
 yuthon_notice/security/yuthon_notice_rule.xml | 15 +++++++++++++++
 .../views/yuthon_notice_type_views.xml        |  8 +-------
 yuthon_notice/views/yuthon_notice_views.xml   | 19 +++++++++----------
 6 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 yuthon_notice/data/notice_type_data.xml
 create mode 100644 yuthon_notice/security/yuthon_notice_rule.xml

diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py
index 90e6c6103..5870b54ee 100644
--- a/yuthon_notice/__manifest__.py
+++ b/yuthon_notice/__manifest__.py
@@ -14,8 +14,10 @@
     'data': [
         'security/ir.model.access.csv',
         'security/yuthon_notice_group.xml',
+        'security/yuthon_notice_rule.xml',
         'data/notice_code_data.xml',
         'data/notice_cron_data.xml',
+        'data/notice_type_data.xml',
         'views/yuthon_notice_views.xml',
         'views/yuthon_notice_type_views.xml',
         'views/yuthon_confirm_users_views.xml',
diff --git a/yuthon_notice/data/notice_type_data.xml b/yuthon_notice/data/notice_type_data.xml
new file mode 100644
index 000000000..ce6d7e657
--- /dev/null
+++ b/yuthon_notice/data/notice_type_data.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="yuthon_notice_type1" model="yuthon.notice.type"><field name="name">通知</field></record>
+    <record id="yuthon_notice_type2" model="yuthon.notice.type"><field name="name">公告</field></record>
+    <record id="yuthon_notice_type3" model="yuthon.notice.type"><field name="name">决定</field></record>
+    <record id="yuthon_notice_type4" model="yuthon.notice.type"><field name="name">其他</field></record>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_notice/security/yuthon_notice_group.xml b/yuthon_notice/security/yuthon_notice_group.xml
index 62eba4773..7ff9f56b3 100644
--- a/yuthon_notice/security/yuthon_notice_group.xml
+++ b/yuthon_notice/security/yuthon_notice_group.xml
@@ -4,7 +4,7 @@
         <field name="name">通知公告组</field>
     </record>
 
-    <record id="module_category_yuthon_notice_user" model="res.groups">
+    <record id="group_notice_user" model="res.groups">
         <field name="name">用户</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
     </record>
@@ -12,7 +12,7 @@
     <record id="group_notice_admin" model="res.groups">
         <field name="name">通知管理员</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_notice_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
 
diff --git a/yuthon_notice/security/yuthon_notice_rule.xml b/yuthon_notice/security/yuthon_notice_rule.xml
new file mode 100644
index 000000000..69d9fc5fb
--- /dev/null
+++ b/yuthon_notice/security/yuthon_notice_rule.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="yuthon_notice_company_rule_user" model="ir.rule">
+        <field name="name">yuthon_notice_company_rule_user</field>
+        <field name="model_id" ref="model_yuthon_notice"/>
+        <field name="domain_force">[('employee_ids', 'in', [user.employee_id.id])]</field>
+        <field name="groups" eval="[(4, ref('group_notice_user'))]"/>
+    </record>
+    <record id="yuthon_notice_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_notice_company_rule_admin</field>
+        <field name="model_id" ref="model_yuthon_notice"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_notice_admin'))]"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_notice/views/yuthon_notice_type_views.xml b/yuthon_notice/views/yuthon_notice_type_views.xml
index 64ef5ad9d..2aecedb15 100644
--- a/yuthon_notice/views/yuthon_notice_type_views.xml
+++ b/yuthon_notice/views/yuthon_notice_type_views.xml
@@ -22,7 +22,7 @@
             id="yuthon_notice_type_setting"
             parent="yuthon_notice_menu_config_root"
             name="配置"
-            groups="yuthon_notice.group_notice_admin"
+            groups="group_notice_admin"
             sequence="7"/>
 
     <menuitem id="yuthon_notice_type_menu"
@@ -31,10 +31,4 @@
             action="approval_notice_type_action"
             sequence="1"/>
 
-    <menuitem id="yuthon_confirm_users_menu"
-            parent="yuthon_notice_type_setting"
-            name="公告确认信息"
-            action="yuthon_confirm_users_action"
-            sequence="2"/>
-
 </odoo>
\ No newline at end of file
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 7fe75e371..a3ba8a4c9 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -138,41 +138,40 @@
         </field>
     </record>
 
-    <record id="approval_notice_action2" model="ir.actions.act_window">
-        <field name="name">我的通知公告</field>
+    <record id="approval_notice_action" model="ir.actions.act_window">
+        <field name="name">通知公告管理</field>
         <field name="res_model">yuthon.notice</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('notice_state', '=', 'yes'), ('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
         <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_notice.view_yuthon_notice_tree2')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_notice.view_yuthon_notice_form2')})]"/>
     </record>
 
-    <record id="approval_notice_action" model="ir.actions.act_window">
-        <field name="name">通知公告管理</field>
+    <record id="approval_notice_action2" model="ir.actions.act_window">
+        <field name="name">我的通知公告</field>
         <field name="res_model">yuthon.notice</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('employee_ids', 'in', [user.employee_id.id])]</field>
+        <field name="domain">[('notice_state', '=', 'yes')]</field>
     </record>
 
     <menuitem id="yuthon_notice_menu_config_root"
             name="通知公告"
             web_icon="yuthon_notice,static/description/icon.png"
-            groups="module_category_yuthon_notice_user"
+            groups="group_notice_user"
             sequence="1"/>
 
     <menuitem id="yuthon_notice_menu1"
             parent="yuthon_notice_menu_config_root"
             name="通知公告管理"
-            action="approval_notice_action"
+            action="approval_notice_action2"
             groups="group_notice_admin"
             sequence="1"/>
 
     <menuitem id="yuthon_notice_my_menu"
             parent="yuthon_notice_menu_config_root"
             name="通知公告"
-            action="approval_notice_action2"
-            groups="module_category_yuthon_notice_user"
+            action="approval_notice_action"
+            groups="group_notice_user"
             sequence="2"/>
 
 </odoo>
\ No newline at end of file