设备列表

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java

@@ -101,15 +101,12 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
 
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<PlatRoomBedDevice> list1 = new ArrayList<>();
         List<PlatRoomBedDevice> list1 = new ArrayList<>();
-        if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
-
-            list.forEach(item->{
-                if(!item.getRoomId().equals(dto.getRoomId())
-                        || (item.getRoomId().equals(dto.getRoomId()) && StringUtil.isNotEmpty(item.getBedId()))){
-                    list1.add(item);
-                }
-            });
-        }
+        list.forEach(item->{
+            if(!item.getRoomId().equals(dto.getRoomId())
+                    || (item.getRoomId().equals(dto.getRoomId()) && StringUtil.isNotEmpty(item.getBedId()))){
+                list1.add(item);
+            }
+        });
 
 
 
 
         List<String> listEquipmentIds = list1.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list1.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());