From af39365d9b0a2f4896470c505cf085776009ca97 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 28 十二月 2023 16:06:24 +0800
Subject: [PATCH] 车辆管理数量BUG
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 f6d4342..0a67bcb 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
@@ -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;
}
--
Gitblit v1.9.3