From 9d09e1ed51ef330a378f7d564bacced7bb7e7d13 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 三月 2025 15:31:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index be622a9..a5562a3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1152,9 +1152,12 @@
data.addAll(data1);
}
ids = new HashSet<>(data);
+ }else{
+ ids = new HashSet<>();
+ ids.add(-1);
}
}
- mongoChargingOrderQuery.setSiteIds(ids.stream().collect(Collectors.toList()));
+ mongoChargingOrderQuery.setSiteIds(ids);
mongoChargingOrderQuery.setPageSize(10);
R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery);
UploadRealTimeMonitoringPageData data1 = all.getData();
--
Gitblit v1.7.1