diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index 021928703..9935f5da4 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -32,6 +32,13 @@ class YuthonNotice(models.Model): approval_user_id = fields.Many2one('res.users', string="审核人") approval_date = fields.Datetime(string="审核日期") is_sticky = fields.Boolean(string="是否置顶") + users_ids = fields.Many2many('res.users', string='用户') + + @api.onchange('employee_ids') + def onchange_employee_ids(self): + for notice in self: + users = notice.employee_ids.mapped('user_id') + notice.users_ids = users def get_no_read_count(self): return self.search_count([('is_notice_roger', '=', 'no'), ('notice_state', '=', 'yes')]) diff --git a/yuthon_notice/security/yuthon_notice_group.xml b/yuthon_notice/security/yuthon_notice_group.xml index 5c557e2b9..7ff9f56b3 100644 --- a/yuthon_notice/security/yuthon_notice_group.xml +++ b/yuthon_notice/security/yuthon_notice_group.xml @@ -12,6 +12,7 @@ 通知管理员 + diff --git a/yuthon_notice/security/yuthon_notice_rule.xml b/yuthon_notice/security/yuthon_notice_rule.xml index 69d9fc5fb..2046ea23e 100644 --- a/yuthon_notice/security/yuthon_notice_rule.xml +++ b/yuthon_notice/security/yuthon_notice_rule.xml @@ -1,11 +1,11 @@ - - yuthon_notice_company_rule_user - - [('employee_ids', 'in', [user.employee_id.id])] - - + + + + + + yuthon_notice_company_rule_admin diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml index 9d41d14d2..6c29f4151 100644 --- a/yuthon_notice/views/yuthon_notice_views.xml +++ b/yuthon_notice/views/yuthon_notice_views.xml @@ -11,6 +11,7 @@ + @@ -81,6 +82,7 @@ + @@ -151,6 +153,7 @@ 通知公告 yuthon.notice tree,form + [('users_ids', 'in', [uid])]