Merge remote-tracking branch 'origin/dev' into dev

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

@@ -97,8 +97,6 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         PlatSpaceDeviceQueryDTO dto = pageReqDTO.getData();
         PlatSpaceDeviceQueryDTO dto = pageReqDTO.getData();
 
 
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
-//        queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
-
         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())) {
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
@@ -113,6 +111,9 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
 
 
 
         List<String> listEquipmentIds = list1.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list1.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
+        if (CommonEnum.YES.getValue().equals(dto.getIsRoom())) {
+            listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
+        }
 
 
         String orgId = "";
         String orgId = "";
         if (StringUtil.isNotEmpty(dto.getRoomId())) {
         if (StringUtil.isNotEmpty(dto.getRoomId())) {