From dee2cf1591b135c9bf75dcaf81a96ee48435b5f9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 3770f6b..efec4be 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -357,11 +357,13 @@
@Override
public Map<String, Object> getArdSyCarAndDeptByCarId(String carId) {
Map<String, Object> result = ardSyCarMapper.getArdSyCarAndDeptByCarId(carId);
- if(result.get("carPicture") != null){
- if(!((String)result.get("carPicture")).equals("")){
- String url = ((String)result.get("carPicture")).split("sycar")[0];
- String carModel = url + (String)result.get("carModel");
- result.put("carModel",carModel);
+ if(result != null){
+ if(result.get("carPicture") != null){
+ if(!((String)result.get("carPicture")).equals("")){
+ String url = ((String)result.get("carPicture")).split("sycar")[0];
+ String carModel = url + (String)result.get("carModel");
+ result.put("carModel",carModel);
+ }
}
}
return result;
@@ -555,7 +557,14 @@
for (int i = 0; i < carList.size(); i++) {
ArdSyCar ardSyCar = carList.get(i);
if(carId.equals(ardSyCar.getCarId())){
- m.put("carModel",ardSyCar.getCarModel());
+ String url = "";
+ if(ardSyCar.getCarPicture() != null){
+ if(!ardSyCar.getCarPicture().equals("")){
+ url = ardSyCar.getCarPicture().split("sycar")[0];
+ }
+ }
+ m.put("carModel",url + ardSyCar.getCarModel());//zns
+ //m.put("carModel",ardSyCar.getCarModel());
m.put("carTypeArd",ardSyCar.getCarType());
m.put("carBrand",ardSyCar.getCarBrand());
m.put("carPicture",ardSyCar.getCarPicture());
--
Gitblit v1.9.3