From fa5d9d3df4fce6129de2f37ec6e01a289950e268 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:35:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=8C=E7=BA=A7=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E4=B8=80=E7=BA=A7=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9F=A5=E7=9C=8B=E4=B8=8D=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=20(#12993)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/tickets/filters.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/tickets/filters.py b/apps/tickets/filters.py index 6d1904bb4..dcba10036 100644 --- a/apps/tickets/filters.py +++ b/apps/tickets/filters.py @@ -1,10 +1,10 @@ -from django.db.models import Subquery, OuterRef, Value, F, Q +from django.db.models import Value, F, Q from django.db.models.functions import Concat from django_filters import rest_framework as filters from common.drf.filters import BaseFilterSet from tickets.models import ( - Ticket, TicketStep, ApplyAssetTicket, + Ticket, ApplyAssetTicket, ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket ) @@ -22,11 +22,7 @@ class TicketFilter(BaseFilterSet): ) def filter_assignees_id(self, queryset, name, value): - step_qs = TicketStep.objects.filter( - level=OuterRef("approval_step") - ).values_list('id', flat=True) return queryset.filter( - ticket_steps__id__in=Subquery(step_qs), ticket_steps__ticket_assignees__assignee__id=value )