|
|
@@ -27,12 +27,12 @@ def consumer_shot_unbinding_list(request, administrator):
|
27
|
27
|
unbindings = ConsumeShotUnbindingInfo.objects.filter(status=True).order_by('-created_at')
|
28
|
28
|
|
29
|
29
|
if query:
|
30
|
|
- user_id = ''
|
|
30
|
+ user_ids = []
|
31
|
31
|
try:
|
32
|
|
- user_id = UserInfo.objects.get(phone__icontains=query, status=True)
|
|
32
|
+ user_ids = UserInfo.objects.filter(phone__icontains=query, status=True).values_list('user_id', flat=True)
|
33
|
33
|
except UserInfo.DoesNotExist:
|
34
|
34
|
pass
|
35
|
|
- unbindings = unbindings.filter(Q(sn__icontains=query) | Q(user_id=user_id))
|
|
35
|
+ unbindings = unbindings.filter(Q(sn__icontains=query) | Q(user_id__in=user_ids))
|
36
|
36
|
|
37
|
37
|
if start_time and end_time:
|
38
|
38
|
start_time = tc.string_to_utc_datetime(start_time, format='%Y%m%d')
|