From f18d5a75c35774ba77802cd1f0c76706aeda8df7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 23 十一月 2022 14:21:59 +0800
Subject: [PATCH] bug处理
---
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index c8e08d6..b7166bf 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -7,6 +7,7 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
+import com.ycl.dto.carManage.CarEnforcecarVo;
import com.ycl.entity.carManage.CarEnforcecar;
import com.ycl.entity.carManage.CarSlagcar;
import com.ycl.enums.common.ResultCode;
@@ -17,6 +18,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -38,15 +41,11 @@
@ApiOperation(value = "鏌ヨ鎵ф硶杞�")
@GetMapping("/query_enforce")
- public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
- @RequestParam Integer size,
- @RequestParam Integer current) {
- Page<CarEnforcecar> carEnforcecarPage = new Page<>();
- carEnforcecarPage.setSize(size);
- carEnforcecarPage.setCurrent(current);
- return CommonResult.success(iCarEnforcecarService
- .page(carEnforcecarPage, new LambdaQueryWrapper<CarEnforcecar>()
- .like(StringUtils.isNotBlank(carNum), CarEnforcecar::getCarNumber, carNum)));
+ public CommonResult<Page<CarEnforcecarVo>> searchEnforceCar(@RequestParam(required = false) String carNum,
+ @RequestParam Integer size,
+ @RequestParam Integer current) {
+ Page<CarEnforcecarVo> page = iCarEnforcecarService.searchEnforceCar(size, current, carNum);
+ return CommonResult.success(page);
}
@ApiOperation(value = "鏌ヨ娓ｅ湡杞�")
@@ -98,7 +97,7 @@
CarEnforcecar enforceCar = iCarEnforcecarService
.getOne(new LambdaQueryWrapper<CarEnforcecar>()
.eq(CarEnforcecar::getCarNumber, carEnforcecar.getCarNumber()));
- if (StringUtils.isNotBlank(enforceCar.getCarNumber())) {
+ if (enforceCar != null && StringUtils.isNotBlank(enforceCar.getCarNumber())) {
throw new ApiException(ResultCode.CAR_NUMBER_REPETITION.getMessage());
}
return CommonResult.success(iCarEnforcecarService.save(carEnforcecar));
@@ -111,7 +110,7 @@
CarSlagcar slagCar = iCarSlagcarService
.getOne(new LambdaQueryWrapper<CarSlagcar>()
.eq(CarSlagcar::getCarNumber, carSlagcar.getCarNumber()));
- if (StringUtils.isNotBlank(slagCar.getCarNumber())) {
+ if (slagCar != null && StringUtils.isNotBlank(slagCar.getCarNumber())) {
throw new ApiException(ResultCode.CAR_NUMBER_REPETITION.getMessage());
}
return CommonResult.success(iCarSlagcarService.save(carSlagcar));
--
Gitblit v1.8.0