|
|
@@ -78,30 +78,27 @@ class UnicomManageControllerView(View):
|
|
|
try:
|
|
|
|
|
|
unicom_device_qs = UnicomDeviceInfo.objects.all()
|
|
|
+ device_user_qs = Device_User.objects.filter().values(
|
|
|
+ 'userID', 'NickName', 'phone')
|
|
|
if iccid:
|
|
|
unicom_device_qs = unicom_device_qs.filter(iccid=iccid)
|
|
|
if serial_no:
|
|
|
unicom_device_qs = unicom_device_qs.filter(serial_no=serial_no)
|
|
|
|
|
|
- device_user_qs = Device_User.objects.filter().values(
|
|
|
- 'userID', 'NickName', 'phone')
|
|
|
- userID = ''
|
|
|
if NickName:
|
|
|
device_user_qs = device_user_qs.filter(NickName=NickName)
|
|
|
if not device_user_qs.exists():
|
|
|
return response.json(0, [])
|
|
|
userID = device_user_qs.first()['userID']
|
|
|
+ unicom_device_qs = unicom_device_qs.filter(user_id=userID)
|
|
|
|
|
|
if phone:
|
|
|
device_user_qs = device_user_qs.filter(phone=phone)
|
|
|
if not device_user_qs.exists():
|
|
|
return response.json(0, [])
|
|
|
userID = device_user_qs.first()['userID']
|
|
|
- if userID:
|
|
|
- unicom_device_qs.filter(user_id=userID)
|
|
|
+ unicom_device_qs = unicom_device_qs.filter(user_id=userID)
|
|
|
|
|
|
- if not unicom_device_qs.exists():
|
|
|
- return response.json(0, [])
|
|
|
total = unicom_device_qs.count()
|
|
|
unicom_device_qs = unicom_device_qs[(page - 1) * line:page * line]
|
|
|
|
|
|
@@ -115,7 +112,7 @@ class UnicomManageControllerView(View):
|
|
|
'mainCard': unicom_device.main_card,
|
|
|
'createdTime': unicom_device.created_time,
|
|
|
}
|
|
|
- device_user_qs = Device_User.objects.filter(userID=unicom_device.user_id).values('NickName', 'phone')
|
|
|
+ device_user_qs = device_user_qs.filter(userID=unicom_device.user_id).values('NickName', 'phone')
|
|
|
data['NickName'] = device_user_qs[0]['NickName'] if device_user_qs.first() else ''
|
|
|
data['phone'] = device_user_qs[0]['phone'] if device_user_qs.first() else ''
|
|
|
list_data.append(data)
|
