设备列表

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

@@ -98,11 +98,20 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
 
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
+
+        List<PlatRoomBedDevice> list = list(queryWrapper1);
+        List<PlatRoomBedDevice> list1 = new ArrayList<>();
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
-            queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
-            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
+
+            list.forEach(item->{
+                if(!item.getRoomId().equals(dto.getRoomId())
+                        || (item.getRoomId().equals(dto.getRoomId()) && StringUtil.isEmpty(item.getBedId()))){
+                    list1.add(item);
+                }
+            });
         }
         }
-        List<PlatRoomBedDevice> list = list(queryWrapper1);
+
+
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
 
 
         String orgId = "";
         String orgId = "";