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

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

@@ -86,7 +86,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
         if (StringUtil.isNotEmpty(dto.getRoomId())) {
-            queryWrapper1.ne(PlatRoomBedDevice::getRoomId, dto.getRoomId());
+            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
         }
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
             queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
@@ -94,7 +94,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
 
-        String orgId = null;
+        String orgId = "";
         if(StringUtil.isNotEmpty(dto.getRoomId())){
             PlatRoom platRoom = platRoomService.getById(dto.getRoomId());
             PlatSpace platSpace = platSpaceService.getById(platRoom.getSpaceId());
@@ -110,7 +110,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatDevice::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getProductName()), PlatDevice::getProductName, dto.getProductName());
         queryWrapper.eq(StringUtil.isNotEmpty(dto.getStatus()), PlatDevice::getStatus, dto.getStatus());
-        queryWrapper.eq(StringUtil.isNotEmpty(orgId),PlatDevice::getOrgId,orgId);
+        queryWrapper.eq(PlatDevice::getOrgId,orgId);
         Page<PlatDevice> pages = platDeviceService.page(p, queryWrapper);
         List<PlatDeviceDTO> listRecord = BeanDtoVoUtils.listVo(pages.getRecords(), PlatDeviceDTO.class);