设备列表

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

@@ -91,8 +91,8 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
         Page<PlatDevice> p = PageUtil.toMpPage(pageReqDTO);
         LambdaQueryWrapper<PlatDevice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.notIn(PlatDevice::getId, listEquipmentIds);
-        queryWrapper.eq(PlatDevice::getCategory,dto.getCategory());
+        queryWrapper.notIn(!listEquipmentIds.isEmpty(),PlatDevice::getId, listEquipmentIds);
+        queryWrapper.eq(StringUtil.isNotEmpty(dto.getCategory()), PlatDevice::getCategory,dto.getCategory());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getOriDeviceId()), PlatDevice::getOriDeviceId, dto.getOriDeviceId());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatDevice::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getProductName()), PlatDevice::getProductName, dto.getProductName());