更新用户列表

smartfarming/views/user.py

@@ -244,14 +244,13 @@ class UserListAPIView(APIView):
         search = request_data.get("search")
         page_num = int(request_data.get("pagenum", 1))
         page_size = int(request_data.get("pagesize", 10))
+        users = User.objects.filter(is_active=1).exclude(username='yunfei').values("id", "username", "date_joined").order_by("-date_joined")
         uids = []
         if search:
             device_user = DeviceUser.objects.filter(Q(real_name__icontains=search) | Q(mobile__icontains=search))
             uids = [i.uid for i in device_user]
         if uids:
-            users = User.objects.filter(id__in = uids, is_active=1).values("id", "username", "date_joined").order_by("-date_joined")
-        else:
-            users = User.objects.filter(is_active=1).values("id", "username", "date_joined").order_by("-date_joined")
+            users = users.filter(id__in = uids, is_active=1)
         user_lst = []
         try:
             for user in users: