From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 527b123..f2d4893 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -77,14 +77,15 @@
@Override
public Map<Integer,List<SensorUnit>> queryGroupSensorBySids(List<Integer> sensorIds){
SensorUnit sensorUnitQuery = new SensorUnit();
- Map<Integer,List<SensorUnit>> resultList = new HashMap<>();
+ Map<Integer,List<SensorUnit>> resultListMap = new HashMap<>();
for(Integer sensorId: sensorIds) {
sensorUnitQuery.setSensorId(sensorId);
+ sensorUnitQuery.setIsDelete(false);
List<SensorUnit> sensorUnitList = sensorUnitMapper.select(sensorUnitQuery);
if(sensorUnitList!=null&&sensorUnitList.size()>0){
- resultList.put(sensorId,sensorUnitList);
+ resultListMap.put(sensorId,sensorUnitList);
}
}
- return resultList;
+ return resultListMap;
}
}
--
Gitblit v1.8.0