|
@@ -116,7 +116,10 @@ class EquipmentManagerV3(View):
|
|
View_Password = '' if Type in dvr_type_list else 'admin'
|
|
View_Password = '' if Type in dvr_type_list else 'admin'
|
|
|
|
|
|
id = CommonService.getUserID(getUser=False)
|
|
id = CommonService.getUserID(getUser=False)
|
|
- userName = Device_User.objects.get(userID=userID).username
|
|
|
|
|
|
+ device_user_qs = Device_User.objects.filter(userID=userID).values('username')
|
|
|
|
+ if not device_user_qs.exists():
|
|
|
|
+ return response.json(173)
|
|
|
|
+ userName = device_user_qs[0]['username']
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
|
|
|
|
@@ -359,7 +362,10 @@ class EquipmentManagerV3(View):
|
|
device_info_qs.delete()
|
|
device_info_qs.delete()
|
|
|
|
|
|
id = CommonService.getUserID(getUser=False)
|
|
id = CommonService.getUserID(getUser=False)
|
|
- userName = Device_User.objects.get(userID=userID).username
|
|
|
|
|
|
+ device_user_qs = Device_User.objects.filter(userID=userID).values('username')
|
|
|
|
+ if not device_user_qs.exists():
|
|
|
|
+ return response.json(173)
|
|
|
|
+ userName = device_user_qs[0]['username']
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
|
|
|