From 3e7eef25226b960789802e3b7b6b2f3bac8fe9bf Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Sun, 19 Feb 2023 20:20:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=B9=B3=E5=8F=B0Activity=E5=88=97?= =?UTF-8?q?=E8=A1=A8500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/audits/api.py b/apps/audits/api.py index d1915206a..703dea3b8 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -8,6 +8,7 @@ from rest_framework import generics from rest_framework.mixins import ListModelMixin, CreateModelMixin, RetrieveModelMixin from rest_framework.permissions import IsAuthenticated +from common.utils import is_uuid from common.api import JMSGenericViewSet from common.drf.filters import DatetimeRangeFilter from common.plugins.es import QuerySet as ESQuerySet @@ -94,8 +95,9 @@ class ResourceActivityAPIView(generics.ListAPIView): @staticmethod def get_operate_log_qs(fields, limit=30, resource_id=None): - q = Q(resource_id=resource_id) - user = User.objects.filter(id=resource_id).first() + q, user = Q(resource_id=resource_id), None + if is_uuid(resource_id): + user = User.objects.filter(id=resource_id).first() if user: q |= Q(user=str(user)) queryset = OperateLog.objects.filter(q).annotate( From 37f74d7d73a028b03fc586673f0818c180c4a39a Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Sun, 19 Feb 2023 20:27:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A0=BC=E5=BC=8F=E7=9C=8B=E8=B5=B7?= =?UTF-8?q?=E6=9D=A5=E5=A5=BD=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/audits/api.py b/apps/audits/api.py index 8f833aad8..155c1737e 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -97,7 +97,7 @@ class ResourceActivityAPIView(generics.ListAPIView): q, user = Q(resource_id=resource_id), None if is_uuid(resource_id): user = User.objects.filter(id=resource_id).first() - if user: + if user is not None: q |= Q(user=str(user)) queryset = OperateLog.objects.filter(q).annotate( r_type=Value(ActivityChoices.operate_log, CharField()),