aijinhui
2023-12-28 af39365d9b0a2f4896470c505cf085776009ca97
车辆管理数量BUG
已修改1个文件
22 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -623,10 +623,11 @@
        queryWrapper.in("dept_id", deptList);
        List<ArdSyCar> carList = ardSyCarMapper.selectList(queryWrapper);
        //对比把匹配到的数据添加到list中
        for (Map<String, String> m : list) {
            String carId = m.get("carId");
            for (int i = 0; i < carList.size(); i++) {
                ArdSyCar ardSyCar = carList.get(i);
        for (int i = 0; i < list.size(); i++) {
            String carId = list.get(i).get("carId");
            Boolean isCar = false;
            for (int j = 0; j < carList.size(); j++) {
                ArdSyCar ardSyCar = carList.get(j);
                if (carId.equals(ardSyCar.getCarId())) {
                    /*String url = "";
                    if (ardSyCar.getCarPicture() != null) {
@@ -634,13 +635,18 @@
                            url = ardSyCar.getCarPicture().split("sycar")[0];
                        }
                    }*/
                    m.put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    list.get(i).put("carModel", this.minioEndpoint + "/" + ardSyCar.getCarModel());//zns
                    //m.put("carModel",ardSyCar.getCarModel());
                    m.put("carTypeArd", ardSyCar.getCarType());
                    m.put("carBrand", ardSyCar.getCarBrand());
                    m.put("carPicture", ardSyCar.getCarPicture());
                    list.get(i).put("carTypeArd", ardSyCar.getCarType());
                    list.get(i).put("carBrand", ardSyCar.getCarBrand());
                    list.get(i).put("carPicture", ardSyCar.getCarPicture());
                    isCar = true;
                    break;
                }
            }
            if(!isCar){
                list.remove(list.get(i));
            }
        }
        return list;
    }