feat: mlog和handover添加cbatch查询条件2
This commit is contained in:
parent
8fb204a93d
commit
a672a76eee
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue