Compare commits
No commits in common. "77fcdad50f27e273ad19e1e15a95a17998c1e1f0" and "e672c238dd919fd6c90f38652c8c5c583a2b3024" have entirely different histories.
77fcdad50f
...
e672c238dd
|
|
@ -1,12 +1,10 @@
|
||||||
package com.njzscloud.supervisory.goods.service;
|
package com.njzscloud.supervisory.goods.service;
|
||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.njzscloud.common.mp.support.PageParam;
|
import com.njzscloud.common.mp.support.PageParam;
|
||||||
import com.njzscloud.common.mp.support.PageResult;
|
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.mapper.GoodsCategoryMapper;
|
||||||
import com.njzscloud.supervisory.goods.pojo.entity.GoodsCategoryEntity;
|
import com.njzscloud.supervisory.goods.pojo.entity.GoodsCategoryEntity;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
@ -55,9 +53,7 @@ public class GoodsCategoryService extends ServiceImpl<GoodsCategoryMapper, Goods
|
||||||
* 分页查询
|
* 分页查询
|
||||||
*/
|
*/
|
||||||
public PageResult<GoodsCategoryEntity> paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity) {
|
public PageResult<GoodsCategoryEntity> paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity) {
|
||||||
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsCategoryEntity>lambdaQuery()
|
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsCategoryEntity>query(goodsCategoryEntity)));
|
||||||
.like(StrUtil.isNotBlank(goodsCategoryEntity.getCategoryName()), GoodsCategoryEntity::getCategoryName,
|
|
||||||
goodsCategoryEntity.getCategoryName())));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package com.njzscloud.supervisory.goods.service;
|
package com.njzscloud.supervisory.goods.service;
|
||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
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) {
|
public PageResult<GoodsInfoEntity> paging(PageParam pageParam, GoodsInfoEntity goodsInfoEntity) {
|
||||||
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsInfoEntity>lambdaQuery()
|
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<GoodsInfoEntity>query(goodsInfoEntity)));
|
||||||
.like(StrUtil.isNotBlank(goodsInfoEntity.getGoodsName()), GoodsInfoEntity::getGoodsName,
|
|
||||||
goodsInfoEntity.getGoodsName())));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue