From 466c70dccc2b46ffa62fd14c8b2f88349c5ef9c6 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 二月 2025 22:58:28 +0800
Subject: [PATCH] Merge branch 'master' into develop1.0
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
index 16d8a62..c519c97 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
@@ -358,8 +358,7 @@
*/
@Override
public List<EnergyIndex> listDeviceIndex(String nodeId, String meterId) {
- return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery()
- .eq(EnergyIndex::getNodeId, nodeId)
- .eq(EnergyIndex::getMeterId, meterId));
+ List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByMeterIdIndexCode(meterId,null,nodeId);
+ return energyIndexList;
}
}
--
Gitblit v1.9.3