From ec4cdc801fa4a4b8b0f841d378b09b5632582e09 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Wed, 22 Feb 2023 19:42:40 +0800
Subject: [PATCH] perf: operate log amount (#9695)

Co-authored-by: feng <1304903146@qq.com>
---
 apps/audits/api.py     | 3 +--
 apps/jumpserver/api.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/audits/api.py b/apps/audits/api.py
index 968fe19db..82c8b43e5 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -147,8 +147,7 @@ class OperateLogViewSet(OrgReadonlyModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        with tmp_to_root_org():
-            qs = OperateLog.objects.all()
+        qs = OperateLog.objects.all()
         es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG
         if es_config:
             engine_mod = import_module(TYPE_ENGINE_MAPPING['es'])
diff --git a/apps/jumpserver/api.py b/apps/jumpserver/api.py
index 1c766a972..b5ebd9ebc 100644
--- a/apps/jumpserver/api.py
+++ b/apps/jumpserver/api.py
@@ -101,9 +101,9 @@ class DateTimeMixin:
 
     @lazyproperty
     def operate_logs_queryset(self):
+        from audits.api import OperateLogViewSet
         t = self.days_to_datetime
-        queryset = OperateLog.objects.filter(datetime__gte=t)
-        queryset = self.get_logs_queryset(queryset, 'user')
+        queryset = OperateLogViewSet().get_queryset().filter(datetime__gte=t)
         return queryset
 
     @lazyproperty