From e42fd6637b3b3772f0270786481b0e8681f9fc10 Mon Sep 17 00:00:00 2001 From: xianfuxing Date: Tue, 9 Oct 2018 22:22:47 +0800 Subject: [PATCH] # up device query filter by org --- apps/counter/api/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/counter/api/views.py b/apps/counter/api/views.py index 4c17c58..40b9288 100644 --- a/apps/counter/api/views.py +++ b/apps/counter/api/views.py @@ -50,9 +50,11 @@ class DeviceInfoListAPIView(ListAPIView): user_roles = user.role.split(',') queryset_list = DeviceInfo.objects.get_queryset().order_by('-online') if 'staff' in user_roles or 'admin' in user_roles: - queryset_list = DeviceInfo.objects.get_queryset(org=user.org).order_by('-online') + queryset_ids = [query.device_id for query in queryset_list if query.org == user.org] + queryset_list = queryset_list.filter(device_id__in=queryset_ids) device_id = self.request.GET.get('device_id') status = self.request.GET.get('status') + if device_id: queryset_list = queryset_list.filter(device_id__icontains=device_id)