Преглед на файлове

修改老版本扫码共享设备不传familyId问题

peng преди 3 години
родител
ревизия
65559c2d5f
променени са 1 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 3 2
      Controller/DeviceShare.py

+ 3 - 2
Controller/DeviceShare.py

@@ -144,7 +144,7 @@ class DeviceShareView(View):
         shareToken = request_dict.get('shareToken', None)
         family_id = request_dict.get('familyId', None)
         room_id = request_dict.get('roomId', None)
-        if not all([shareToken, family_id]):
+        if not shareToken:
             # try:
             #     data = jwt.decode(shareToken, '.#^^&', algorithms='HS256')
             # except Exception as e:
@@ -193,7 +193,8 @@ class DeviceShareView(View):
                                                                           'primaryUserID', 'primaryMaster',
                                                                           'data_joined', 'version',
                                                                           'isVod', 'isExist')
-                    EquipmentFamilyView.family_room_device_save(family_id, room_id, deviceId, dvqs[0]['Type'])
+                    if family_id:
+                        EquipmentFamilyView.family_room_device_save(family_id, room_id, deviceId, dvqs[0]['Type'])
                     dvql = CommonService.qs_to_list(dvqs)
                     ubqs = UID_Bucket.objects.filter(uid=UID). \
                         values('bucket__content', 'status', 'channel', 'endTime', 'uid')