diff --git a/src/main/java/org/springblade/modules/business/controller/CarAdminController.java b/src/main/java/org/springblade/modules/business/controller/CarAdminController.java index 20e38d6..022c05c 100644 --- a/src/main/java/org/springblade/modules/business/controller/CarAdminController.java +++ b/src/main/java/org/springblade/modules/business/controller/CarAdminController.java @@ -132,8 +132,8 @@ public class CarAdminController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 4) @ApiOperation(value = "分页", notes = "传入carAdmin和query") - public R> list(CarAdmin carAdmin, Query query) { - IPage pages = carService.selectCarAdminPage(Condition.getPage(query), carAdmin); + public R> list(@RequestParam(required = false) String name, Query query) { + IPage pages = carService.selectCarAdminPage(Condition.getPage(query), name); return R.data(pages); } diff --git a/src/main/java/org/springblade/modules/business/service/ICarAdminService.java b/src/main/java/org/springblade/modules/business/service/ICarAdminService.java index 1194ba0..a7fb257 100644 --- a/src/main/java/org/springblade/modules/business/service/ICarAdminService.java +++ b/src/main/java/org/springblade/modules/business/service/ICarAdminService.java @@ -21,6 +21,6 @@ public interface ICarAdminService extends BaseService { boolean delete(String ids); - IPage selectCarAdminPage(IPage page, CarAdmin carAdmin); + IPage selectCarAdminPage(IPage page, String name); } diff --git a/src/main/java/org/springblade/modules/business/service/impl/CarAdminServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/CarAdminServiceImpl.java index f8c0050..b9eb24d 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/CarAdminServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/CarAdminServiceImpl.java @@ -87,15 +87,14 @@ public class CarAdminServiceImpl extends BaseServiceImpl selectCarAdminPage(IPage page, CarAdmin carAdmin) { + public IPage selectCarAdminPage(IPage page, String name) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (StringUtils.isNotBlank(carAdmin.getName())) { - queryWrapper.like("name", carAdmin.getName()); + if (StringUtils.isNotBlank(name)) { + queryWrapper.like("name","%"+name+"%"); } - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.orderByDesc("create_time"); + queryWrapper.orderByDesc("create_time"); IPage carAdminPage = new Page<>(page.getCurrent(), page.getSize()); - carAdminMapper.selectPage(carAdminPage, queryWrapper1); + carAdminMapper.selectPage(carAdminPage, queryWrapper); List carAdminList = carAdminPage.getRecords(); List carAdminVoList = new ArrayList<>(); for (CarAdmin admin : carAdminList) { diff --git a/src/main/java/org/springblade/modules/business/vo/CarAdminVo.java b/src/main/java/org/springblade/modules/business/vo/CarAdminVo.java index 86b5b6d..9c2ef8d 100644 --- a/src/main/java/org/springblade/modules/business/vo/CarAdminVo.java +++ b/src/main/java/org/springblade/modules/business/vo/CarAdminVo.java @@ -2,6 +2,7 @@ package org.springblade.modules.business.vo; import lombok.Data; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List;