From 88af33b7c215de75e26d7538857f2c16c2b92c1d Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 8 Mar 2023 15:01:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E7=9C=8B=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=20system?=
 =?UTF-8?q?=20=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98,=20=E5=8F=AA=E6=9C=89=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/audits/api.py         | 2 +-
 apps/audits/serializers.py | 4 ++--
 apps/rbac/const.py         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/audits/api.py b/apps/audits/api.py
index 513796ed9..3bf010ba4 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -149,7 +149,7 @@ class OperateLogViewSet(OrgReadonlyModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        org_q = Q(org_id=Organization.SYSTEM_ID) | Q(org_id=current_org.id)
+        org_q = Q(org_id=current_org.id)
         with tmp_to_root_org():
             qs = OperateLog.objects.filter(org_q)
         es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG
diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py
index c6029e517..204d901e2 100644
--- a/apps/audits/serializers.py
+++ b/apps/audits/serializers.py
@@ -2,7 +2,7 @@
 #
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
-
+from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from audits.backends.db import OperateLogStore
 from common.serializers.fields import LabeledChoiceField
 from common.utils import reverse, i18n_trans
@@ -78,7 +78,7 @@ class OperateLogActionDetailSerializer(serializers.ModelSerializer):
         return data
 
 
-class OperateLogSerializer(serializers.ModelSerializer):
+class OperateLogSerializer(BulkOrgResourceModelSerializer):
     action = LabeledChoiceField(choices=ActionChoices.choices, label=_("Action"))
     resource = serializers.SerializerMethodField(label=_("Resource"))
     resource_type = serializers.SerializerMethodField(label=_('Resource Type'))
diff --git a/apps/rbac/const.py b/apps/rbac/const.py
index eeb09b46e..4ab48161c 100644
--- a/apps/rbac/const.py
+++ b/apps/rbac/const.py
@@ -135,7 +135,7 @@ only_system_permissions = (
     ('xpack', 'license', '*', '*'),
     ('settings', 'setting', '*', '*'),
     ('tickets', '*', '*', '*'),
-    ('ops', 'task', 'view', 'taskmonitor'),
+    ('ops', 'celerytask', 'view', 'taskmonitor'),
     ('terminal', 'terminal', '*', '*'),
     ('terminal', 'commandstorage', '*', '*'),
     ('terminal', 'replaystorage', '*', '*'),