From a672a76eee5596292577e9d713c501667a76ceef Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 20 May 2025 16:03:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlog=E5=92=8Chandover=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?cbatch=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index 334adab8..d0d2fb6a 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -111,7 +111,7 @@ class MlogFilter(filters.FilterSet): } def filter_cbatch(self, queryset, name, value): - return queryset.filter(b_mlog__batch=value)|queryset.filter(batch=value) + return queryset.filter(Q(b_mlog__batch=value) | Q(batch=value)).distinct() class HandoverFilter(filters.FilterSet): @@ -126,7 +126,7 @@ class HandoverFilter(filters.FilterSet): return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=value) def filter_cbatch(self, queryset, name, value): - return queryset.filter(b_handover__batch=value)|queryset.filter(batch=value) + return queryset.filter(Q(b_handover__batch=value) | Q(batch=value)).distinct() class Meta: model = Handover