修复查询家庭设备返回值问题

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -249,6 +249,11 @@ class GatewayFamilyRoomView(View):
         family_id = request_dict.get('familyId', None)
         if not family_id:
             return response.json(444)
+        device_room = {
+            'gateways': [],
+            'cameras': [],
+            'sort': []
+        }
         try:
             family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id).values('device_id',
                                                                                                 'device__Type',
@@ -260,7 +265,7 @@ class GatewayFamilyRoomView(View):
                 'sort', '-device__data_joined')
 
             if not family_room_device_qs.exists():
-                return response.json(0, [])
+                return response.json(0, device_room)
             sort = FamilyRoomDevice.objects.filter(family_id=family_id).values('category').annotate(
                 count=Count('category')).values('category', 'category_sort').order_by('category_sort')
             for item in sort:
@@ -305,11 +310,10 @@ class GatewayFamilyRoomView(View):
                         'nickName': device['device__NickName'],
                         'roomName': room_name.first().name if room_name.exists() else '',
                     })
-            device_room = {
-                'gateways': gateways,
-                'cameras': cameras,
-                'sort': list(sort)
-            }
+
+            device_room['gateways'] = gateways
+            device_room['cameras'] = cameras
+            device_room['sort'] = sort
             return response.json(0, device_room)
         except Exception as e:
             return response.json(500, repr(e))