From b2d1eb1128150f63537c25ce76d0d1540108640b Mon Sep 17 00:00:00 2001
From: chents <78666437@qq.com>
Date: Fri, 12 May 2023 14:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/CarAdminController.java       |  4 ++--
 .../modules/business/service/ICarAdminService.java    |  2 +-
 .../business/service/impl/CarAdminServiceImpl.java    | 11 +++++------
 .../springblade/modules/business/vo/CarAdminVo.java   |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

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<IPage<CarAdminVo>> list(CarAdmin carAdmin, Query query) {
-        IPage<CarAdminVo> pages = carService.selectCarAdminPage(Condition.getPage(query), carAdmin);
+    public R<IPage<CarAdminVo>> list(@RequestParam(required = false) String name, Query query) {
+        IPage<CarAdminVo> 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<CarAdmin> {
 
     boolean delete(String ids);
 
-    IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, CarAdmin carAdmin);
+    IPage<CarAdminVo> selectCarAdminPage(IPage<Object> 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<CarAdminMapper, CarAdmi
      * 分页 车辆信息表
      */
     @Override
-    public IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, CarAdmin carAdmin) {
+    public IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, String name) {
         QueryWrapper<CarAdmin> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(carAdmin.getName())) {
-            queryWrapper.like("name", carAdmin.getName());
+        if (StringUtils.isNotBlank(name)) {
+            queryWrapper.like("name","%"+name+"%");
         }
-        QueryWrapper<CarAdmin> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.orderByDesc("create_time");
+        queryWrapper.orderByDesc("create_time");
         IPage<CarAdmin> carAdminPage = new Page<>(page.getCurrent(), page.getSize());
-        carAdminMapper.selectPage(carAdminPage, queryWrapper1);
+        carAdminMapper.selectPage(carAdminPage, queryWrapper);
         List<CarAdmin> carAdminList = carAdminPage.getRecords();
         List<CarAdminVo> 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;