|
@@ -1,10 +1,8 @@
|
|
package cn.iocoder.yudao.module.pms.dal.mysql;
|
|
package cn.iocoder.yudao.module.pms.dal.mysql;
|
|
|
|
|
|
-import java.util.*;
|
|
|
|
-
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
|
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
@@ -20,7 +18,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
|
|
default PageResult<IotDeviceDO> selectPage(IotDevicePageReqVO reqVO) {
|
|
default PageResult<IotDeviceDO> selectPage(IotDevicePageReqVO reqVO) {
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceDO>()
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<IotDeviceDO>()
|
|
.eqIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
|
|
.eqIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
|
|
- .likeIfPresent(IotDeviceDO::getDeivceName, reqVO.getDeivceName())
|
|
|
|
|
|
+ .likeIfPresent(IotDeviceDO::getDeviceName, reqVO.getDeviceName())
|
|
.eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())
|
|
.eqIfPresent(IotDeviceDO::getBrand, reqVO.getBrand())
|
|
.eqIfPresent(IotDeviceDO::getModel, reqVO.getModel())
|
|
.eqIfPresent(IotDeviceDO::getModel, reqVO.getModel())
|
|
.eqIfPresent(IotDeviceDO::getOrgId, reqVO.getOrgId())
|
|
.eqIfPresent(IotDeviceDO::getOrgId, reqVO.getOrgId())
|