|
@@ -341,11 +341,12 @@ class UserManagement(View):
|
|
|
device_user_qs = Device_User.objects.filter(userEmail__contains=userEmail)
|
|
|
if not device_user_qs.exists():
|
|
|
return response.json(0)
|
|
|
+ total = len(device_user_qs)
|
|
|
+ device_users = device_user_qs[(page - 1) * line:page * line]
|
|
|
|
|
|
else:
|
|
|
- device_user_qs = Device_User.objects.filter() # 查询全部
|
|
|
- total = len(device_user_qs)
|
|
|
- device_users = device_user_qs[(page - 1) * line:page * line]
|
|
|
+ total = Device_User.objects.filter().count()
|
|
|
+ device_users = Device_User.objects.filter()[(page - 1) * line:page * line]
|
|
|
user_list = []
|
|
|
for device_user in device_users:
|
|
|
role = device_user.role.first()
|