diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 8bea87424..040e6f5fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -102,7 +102,7 @@ public class CarInfoController { public Result save(@RequestBody Map map) { log.info("开始添加车辆" + map); Object alarmPushWorkerId = map.get("alarmPushWorkerId"); - String userId = map.get("enterpriseId").toString(); + String userId = String.valueOf(map.get("enterpriseId")); Object driverWorkerName = map.get("driverWorkerName"); List carType = (List) map.get("carType"); List driverWorkerId = (List) map.get("driverWorkerId"); @@ -129,10 +129,13 @@ public class CarInfoController { carInfo.setReserveStartTime(DateUtil.parse(map.get("reserveStartTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT)); carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT)); carInfo.setEntryAndExitPermit(entryAndExitPermit); - carInfo.setCarNumber(map.get("carNumber").toString()); - carInfo.setCarColor(map.get("carColor").toString()); + carInfo.setCarNumber(String.valueOf(map.get("carNumber"))); + Object carColor = map.get("carColor"); + if (carColor != null) { + carInfo.setCarColor(String.valueOf(carColor)); + } carInfo.setCarType(Long.valueOf(carType.get(0).toString())); - carInfo.setDriverTelephone(map.get("driverTelephone").toString()); + carInfo.setDriverTelephone(String.valueOf(map.get("driverTelephone"))); List> carPhotosUrl = (List>) map.get("carPhotosUrl"); List> carPhotosUrls = new ArrayList<>(); if (carPhotosUrl != null) { @@ -191,7 +194,7 @@ public class CarInfoController { carInfo.setXsz(JSON.toJSONString(xszList)); carInfo.setJqx(JSON.toJSONString(jqxList)); carInfo.setOtherProve(JSON.toJSONString(otherProveList)); - carInfo.setProjectSn(map.get("projectSn").toString()); + carInfo.setProjectSn(String.valueOf(map.get("projectSn"))); carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack")); Object outsideDriverIdCard = map.get("outsideDriverIdCard"); if (outsideDriverIdCard != null) {