From 86af2c456ed7dd3bb41933bf4d0a94a492829e03 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 15:13:08 +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 | 10 ++++++++++ yuthon_issue/views/issue_library_views.xml | 13 ++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index b9a5681dd..8c26b8fdb 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -114,6 +114,16 @@ class IssueLibrary(models.Model): is_push_depart = fields.Boolean(string="部门推送") is_meeting = fields.Boolean(string="已过会", compute='_compute_meeting', store=True) + is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company', + search='_search_part_of_company') + + @api.depends_context('uid', 'company') + @api.depends('company_id') + def _compute_is_company(self): + active_company_ids = self.env.companies + for record in self: + record.is_company = record.company_id in active_company_ids + def log_avoidance(self, avoid_user, avoid_comment=''): """记录回避信息,已存在的回避人不重复创建""" existing = self.env['issue.library.avoid.line'].search([ diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index da8fca6f3..7bc92d536 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -378,7 +378,7 @@ issue.library tree,form - [('issue_state', 'not in', ['draft', 'to_draft', 'to_do'])] + [('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_company', '=', True)] @@ -388,7 +388,7 @@ issue.library tree,form - [('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_meeting', '=', True)] + [('issue_state', 'not in', ['draft', 'to_draft', 'to_do']), ('is_meeting', '=', True), ('is_company', '=', True)] @@ -634,8 +634,7 @@ issue.library tree,form [('is_push_party', '=', True), ('is_push_depart', '=', True),('issue_state', 'not in', - ['draft', 'to_draft'])] - + ['draft', 'to_draft']), ('is_company', '=', True)] {'from_action': 'issue_library_action3'} issue.library tree,form [('is_push_party', '=', True),('issue_state', 'not in', ['draft', 'to_draft']), - ('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部')] + ('is_push_depart', '=', True), ('company_id.name', '!=', '集团本部'), ('is_company', '=', True)] {'from_action': 'issue_library_action8'} @@ -847,7 +846,7 @@ issue.library tree,form [('is_push_class', '=', True), ('issue_state', 'not in', ['draft', 'to_draft']), - ('is_push_depart', '=', True)] + ('is_push_depart', '=', True), ('is_company', '=', True)] {'from_action': 'issue_library_action4'} @@ -1044,7 +1043,7 @@ issue.library tree,form [('is_push_boss', '=', True), ('issue_state', 'not in', ['draft', 'to_draft']), - ('is_push_depart', '=', True)] + ('is_push_depart', '=', True), ('is_company', '=', True)] {'from_action': 'issue_library_action5'}