|
@@ -1,9 +1,9 @@
|
|
|
|
|
+import base64
|
|
|
import json
|
|
import json
|
|
|
import re
|
|
import re
|
|
|
import threading
|
|
import threading
|
|
|
import time
|
|
import time
|
|
|
|
|
|
|
|
-import base64
|
|
|
|
|
import oss2
|
|
import oss2
|
|
|
import requests
|
|
import requests
|
|
|
from django.db.models import Q
|
|
from django.db.models import Q
|
|
@@ -606,9 +606,9 @@ class EquipmentManagerV3(View):
|
|
|
# # 过滤已重置的设备
|
|
# # 过滤已重置的设备
|
|
|
dvqs = dvqs.filter(~Q(isExist=2))
|
|
dvqs = dvqs.filter(~Q(isExist=2))
|
|
|
if NickName:
|
|
if NickName:
|
|
|
- dvqs.filter(NickName=NickName)
|
|
|
|
|
|
|
+ dvqs = dvqs.filter(NickName=NickName)
|
|
|
if uid:
|
|
if uid:
|
|
|
- dvqs.filter(UID=uid)
|
|
|
|
|
|
|
+ dvqs = dvqs.filter(UID=uid)
|
|
|
dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account', 'View_Password', 'ChannelIndex',
|
|
dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account', 'View_Password', 'ChannelIndex',
|
|
|
'Type', 'isShare', 'primaryUserID', 'primaryMaster', 'data_joined', 'vodPrimaryUserID',
|
|
'Type', 'isShare', 'primaryUserID', 'primaryMaster', 'data_joined', 'vodPrimaryUserID',
|
|
|
'vodPrimaryMaster', 'userID__userEmail', 'version', 'isVod', 'isExist', 'NotificationMode',
|
|
'vodPrimaryMaster', 'userID__userEmail', 'version', 'isVod', 'isExist', 'NotificationMode',
|
