From e8f4289bce6a4cf7cb81d18de71a49e95b067627 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 15:32:06 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index e56a27f..aacf87e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -328,9 +328,15 @@
}
// 查询所有的停车场的站点id
List<TParkingLot> list = parkingLotService.list();
- List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).collect(Collectors.toList());
+ List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).distinct().collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
- ids.addAll(siteIds);
+ Iterator<Integer> iterator = ids.iterator();
+ while (iterator.hasNext()){
+ Integer next = iterator.next();
+ if(siteIds.contains(next)){
+ iterator.remove();
+ }
+ }
}
return this.baseMapper.getSiteListParkLot(ids);
}
--
Gitblit v1.7.1