2022年10月20 9:14

blade-service/blade-client/src/main/java/org/springblade/client/land/controller/LandVehicleController.java

@@ -18,6 +18,7 @@ package org.springblade.client.land.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -162,8 +163,11 @@ public class LandVehicleController extends BladeController {
 
 			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
 				if (driverList != null) {
-					vehicle.setDriverName(driverList.stream().filter(e -> e.getId().equals(vehicle.getDriverId())).findFirst().get().getName());
-					vehicle.setTel(driverList.stream().filter(e -> e.getId().equals(vehicle.getDriverId())).findFirst().get().getTel());
+					LandDriver landDriver = driverList.stream().filter(e -> e.getId().equals(vehicle.getDriverId())).findFirst().orElse(null);
+					if (ObjectUtils.isNotNull(landDriver)){
+						vehicle.setDriverName(landDriver.getName());
+						vehicle.setTel(landDriver.getTel());
+					}
 				}
 			}
 		});