Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 dee2cf1591b135c9bf75dcaf81a96ee48435b5f9

 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());