|
@@ -147,9 +147,9 @@ class EquipmentFamilyView(View):
|
|
# type 可能为0
|
|
# type 可能为0
|
|
if not all([nick_name, serial_number, device_type]):
|
|
if not all([nick_name, serial_number, device_type]):
|
|
return response.json(444, {'param': 'nick_name, serial_number, device_type'})
|
|
return response.json(444, {'param': 'nick_name, serial_number, device_type'})
|
|
- device_info_qs = Device_Info.objects.filter(serial_number=serial_number,isShare=False)
|
|
|
|
|
|
+ device_info_qs = Device_Info.objects.filter(serial_number=serial_number, isShare=False)
|
|
if device_info_qs:
|
|
if device_info_qs:
|
|
- qs = device_info_qs.values('userID__NickName', 'NickName','userID_id')
|
|
|
|
|
|
+ qs = device_info_qs.values('userID__NickName', 'NickName', 'userID_id')
|
|
nickname = qs[0]['NickName']
|
|
nickname = qs[0]['NickName']
|
|
device_user_id = qs[0]['userID_id']
|
|
device_user_id = qs[0]['userID_id']
|
|
if device_user_id == user_id:
|
|
if device_user_id == user_id:
|
|
@@ -158,8 +158,9 @@ class EquipmentFamilyView(View):
|
|
res = {
|
|
res = {
|
|
'bindUser': qs[0]['userID__NickName'],
|
|
'bindUser': qs[0]['userID__NickName'],
|
|
'bindDeviceName': nickname,
|
|
'bindDeviceName': nickname,
|
|
|
|
+ 'isMainUserExists': 1
|
|
}
|
|
}
|
|
- return response.json(15, res=res)
|
|
|
|
|
|
+ return response.json(0, res=res)
|
|
try:
|
|
try:
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
|
family_id = int(family_id)
|
|
family_id = int(family_id)
|