|
@@ -792,7 +792,8 @@ class SmartSceneView(View):
|
|
|
family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, sub_device=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)
|
|
sub_device_list.append(sub_device_id)
|
|
|
else:
|
|
else:
|
|
|
- family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, device=device_id).values(
|
|
|
|
|
|
|
+ family_room_device_qs = FamilyRoomDevice.objects.filter(Q(family_id=family_id) & Q(device=device_id) &
|
|
|
|
|
+ ~Q(sub_device=0)).values(
|
|
|
'sub_device')
|
|
'sub_device')
|
|
|
device_list.append(device_id)
|
|
device_list.append(device_id)
|
|
|
for device in family_room_device_qs:
|
|
for device in family_room_device_qs:
|
