|
@@ -806,11 +806,12 @@ def deleteInterface(request):
|
|
|
|
|
|
try:
|
|
try:
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
|
- dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
|
|
|
|
|
|
+ dv_qs = Device_Info.objects.filter(userID_id=userID, id=id).values('UID', 'serial_number', 'isShare')
|
|
if not dv_qs.exists():
|
|
if not dv_qs.exists():
|
|
return response.json(14)
|
|
return response.json(14)
|
|
- uid = dv_qs[0].UID
|
|
|
|
- serial_number = dv_qs[0].serial_number
|
|
|
|
|
|
+ uid = dv_qs[0]['uid']
|
|
|
|
+ serial_number = dv_qs[0]['serial_number']
|
|
|
|
+ is_share = dv_qs[0]['isShare']
|
|
|
|
|
|
del_channel_permission_user_id = ''
|
|
del_channel_permission_user_id = ''
|
|
# 主用户删除
|
|
# 主用户删除
|
|
@@ -827,7 +828,7 @@ def deleteInterface(request):
|
|
# 异步删除推送消息
|
|
# 异步删除推送消息
|
|
asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
|
|
asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
|
|
asy.start()
|
|
asy.start()
|
|
- if dv_qs[0].isShare:
|
|
|
|
|
|
+ if is_share:
|
|
del_channel_permission_user_id = userID
|
|
del_channel_permission_user_id = userID
|
|
DeviceShareView.del_device_channel_permission(userID, uid)
|
|
DeviceShareView.del_device_channel_permission(userID, uid)
|
|
|
|
|