diff --git a/core/apps/orders/filters/order.py b/core/apps/orders/filters/order.py index f30d909..3a37c07 100644 --- a/core/apps/orders/filters/order.py +++ b/core/apps/orders/filters/order.py @@ -1,3 +1,5 @@ +from django.db.models import Q + import django_filters from core.apps.orders.models.order import Order @@ -24,4 +26,16 @@ class OrderFilter(django_filters.FilterSet): fields = [ 'wherehouse', 'project', 'project_folder', 'date', ] - \ No newline at end of file + + def filter_queryset(self, queryset): + queryset = super().filter_queryset(queryset) + + project_ids = self.data.getlist('project') + folder_ids = self.data.getlist('project_folder') + + if project_ids and folder_ids: + queryset = queryset.filter( + Q(project__in=project_ids) | Q(project_folder__in=folder_ids) + ) + + return queryset \ No newline at end of file