From 30dbeacdd07b6e70b13dce8d5c2026e349d46b81 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 25 Jan 2024 09:45:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9mio=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81materials=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/inm/filters.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/inm/filters.py b/apps/inm/filters.py index 9b729afc..ac89822e 100644 --- a/apps/inm/filters.py +++ b/apps/inm/filters.py @@ -1,5 +1,6 @@ from django_filters import rest_framework as filters from apps.inm.models import MaterialBatch, MIO +from django.db.models import Q class MaterialBatchFilter(filters.FilterSet): @@ -32,10 +33,10 @@ class MioFilter(filters.FilterSet): def filter_materials__type(self, queryset, name, value): if value: - return queryset.filter(materials__type=value).distinct() + return queryset.filter(Q(materials__type=value) | Q(materials__isnull=True)).distinct() return queryset def filter_materials__type__in(self, queryset, name, value): if value: - return queryset.filter(materials__type__in=value.split(',')).distinct() + return queryset.filter(Q(materials__type__in=value.split(',')) | Q(materials__isnull=True)).distinct() return queryset