|
|
@@ -809,12 +809,12 @@ class SmartSceneView(View):
|
|
|
device_list.append(device['device'])
|
|
|
if device['sub_device']:
|
|
|
sub_device_list.append(device['sub_device'])
|
|
|
- elif sub_device_id:
|
|
|
+ elif sub_device_id: # 查询子设备
|
|
|
family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, sub_device=sub_device_id)
|
|
|
sub_device_list.append(sub_device_id)
|
|
|
- else:
|
|
|
+ else: # 查询网关
|
|
|
family_room_device_qs = FamilyRoomDevice.objects.filter(Q(family_id=family_id) & Q(device=device_id) &
|
|
|
- ~Q(sub_device=0)).values(
|
|
|
+ Q(sub_device=0)).values(
|
|
|
'sub_device')
|
|
|
device_list.append(device_id)
|
|
|
for device in family_room_device_qs:
|
