|
@@ -130,15 +130,15 @@ class EquipmentInfo(View):
|
|
|
if equipment_info_queryset.exists():
|
|
|
equipment_info_count = equipment_info_queryset.count()
|
|
|
equipment_info_res = equipment_info_queryset[(page - 1) * line:page * line]
|
|
|
- send_json = CommonService.query_set_to_dict(equipment_info_res)
|
|
|
+ send_json = CommonService.qs_to_dict(equipment_info_res)
|
|
|
send_json['count'] = equipment_info_count
|
|
|
return response.json(0, send_json)
|
|
|
else:
|
|
|
- uid_list = Device_Info.objects.filter(userID_id=userID).values_list('UID', flat=True)
|
|
|
- devNickName_list = Device_Info.objects.filter(userID_id=userID).values_list('NickName', flat=True)
|
|
|
- if len(uid_list) and len(devNickName_list):
|
|
|
- Equipment_Info.objects.filter(devUid__in=uid_list, devNickName__in=devNickName_list).update(
|
|
|
- userID=userID)
|
|
|
+ # uid_list = Device_Info.objects.filter(userID_id=userID).values_list('UID', flat=True)
|
|
|
+ # devNickName_list = Device_Info.objects.filter(userID_id=userID).values_list('NickName', flat=True)
|
|
|
+ # if len(uid_list) and len(devNickName_list):
|
|
|
+ # Equipment_Info.objects.filter(devUid__in=uid_list, devNickName__in=devNickName_list).update(
|
|
|
+ # userID=userID)
|
|
|
return response.json(0, {'datas': [], 'count': 0})
|
|
|
else:
|
|
|
return response.json(444)
|