Selaa lähdekoodia

修复查询场景日志查询子设备id列表存在问题

locky 2 vuotta sitten
vanhempi
commit
a2b7a0f9a9
1 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 2 1
      Controller/SensorGateway/SmartSceneController.py

+ 2 - 1
Controller/SensorGateway/SmartSceneController.py

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