From cd19a276c90d44b6f6c0c5684bee8adbd7de34e8 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:56:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E8=BF=87=E6=BB=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#12957)?= 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/tickets/filters.py b/apps/tickets/filters.py index 0c1cea8ba..6d1904bb4 100644 --- a/apps/tickets/filters.py +++ b/apps/tickets/filters.py @@ -1,9 +1,8 @@ from django.db.models import Subquery, OuterRef, Value, F, Q -from django_filters import rest_framework as filters 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, ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket @@ -11,10 +10,10 @@ from tickets.models import ( class TicketFilter(BaseFilterSet): - applicant = filters.CharFilter(method='filter_applicant') assignees__id = filters.UUIDFilter(method='filter_assignees_id') relevant_asset = filters.CharFilter(method='filter_relevant_asset') relevant_command = filters.CharFilter(method='filter_relevant_command') + applicant_username_name = filters.CharFilter(method='filter_applicant_username_name') class Meta: model = Ticket @@ -63,9 +62,10 @@ class TicketFilter(BaseFilterSet): ).values_list('id', flat=True) return queryset.filter(id__in=list(command_ids)) - def filter_applicant(self, queryset, name, value): + def filter_applicant_username_name(self, queryset, name, value): return queryset.filter( - Q(applicant__username__icontains=value) | Q(applicant__name__icontains=value) + Q(applicant__name__icontains=value) | + Q(applicant__username__icontains=value) )