Merge remote-tracking branch 'origin/master'

zhangzeli

2021-10-28 451bcfe3e00e68a3ad32415d06bb4411d11bddfe

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CarController.java

@@ -7,7 +7,9 @@
import cn.exrick.xboot.your.entity.Car;
import cn.exrick.xboot.your.service.ICarService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,9 +51,12 @@

    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取")
    public Result<IPage<Car>> getByPage(PageVo page) {

        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page));
    public Result<IPage<Car>> getByPage(String carNo,PageVo page) {
        QueryWrapper<Car> wrapper = new QueryWrapper<>();
        if(!StrUtil.isEmpty(carNo)){
            wrapper.like("car_no","%"+carNo+"%");
        }
        IPage<Car> data = iCarService.page(PageUtil.initMpPage(page),wrapper);
        return new ResultUtil<IPage<Car>>().setData(data);
    }