优化查询用户信息接口

AdminController/UserManageController.py

@@ -341,9 +341,6 @@ class UserManagement(View):
 
         page = int(pageNo)
         line = int(pageSize)
-        country_qs = CountryModel.objects.filter(country_name=countryName).values('id')
-        if not country_qs:
-            return response.json(10, '国家不存在')
 
         try:
             device_user_qs = Device_User.objects.all()
@@ -357,6 +354,9 @@ class UserManagement(View):
             if userEmail:
                 device_user_qs = device_user_qs.filter(userEmail__icontains=userEmail)
             if countryName:
+                country_qs = CountryModel.objects.filter(country_name=countryName).values('id')
+                if not country_qs:
+                    return response.json(10, '国家不存在')
                 device_user_qs = device_user_qs.filter(region_country=country_qs[0]['id'])
             if not device_user_qs.exists():
                 return response.json(0)