Compare commits

..

No commits in common. "77fcdad50f27e273ad19e1e15a95a17998c1e1f0" and "e672c238dd919fd6c90f38652c8c5c583a2b3024" have entirely different histories.

2 changed files with 2 additions and 9 deletions

View File

@ -1,12 +1,10 @@
package com.njzscloud.supervisory.goods.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
import com.njzscloud.supervisory.goods.mapper.GoodsCategoryMapper;
import com.njzscloud.supervisory.goods.pojo.entity.GoodsCategoryEntity;
import lombok.extern.slf4j.Slf4j;
@ -55,9 +53,7 @@ public class GoodsCategoryService extends ServiceImpl<GoodsCategoryMapper, Goods
*
*/
public PageResult<GoodsCategoryEntity> paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsCategoryEntity>lambdaQuery()
.like(StrUtil.isNotBlank(goodsCategoryEntity.getCategoryName()), GoodsCategoryEntity::getCategoryName,
goodsCategoryEntity.getCategoryName())));
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsCategoryEntity>query(goodsCategoryEntity)));
}
}

View File

@ -1,6 +1,5 @@
package com.njzscloud.supervisory.goods.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -54,9 +53,7 @@ public class GoodsInfoService extends ServiceImpl<GoodsInfoMapper, GoodsInfoEnti
*
*/
public PageResult<GoodsInfoEntity> paging(PageParam pageParam, GoodsInfoEntity goodsInfoEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsInfoEntity>lambdaQuery()
.like(StrUtil.isNotBlank(goodsInfoEntity.getGoodsName()), GoodsInfoEntity::getGoodsName,
goodsInfoEntity.getGoodsName())));
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsInfoEntity>query(goodsInfoEntity)));
}
}