From 23d2ea4f1ae4438dc0cd06dce5c6ab2fe7191d41 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 21 十月 2022 15:31:01 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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..fcad4b0 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 @@ -98,7 +98,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 +111,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