From a73922c2cc8e4eaf759d50ff956e8f84935fffed Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 17:08:09 +0800
Subject: [PATCH] 单位配置 bug修复
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 6 +++---
src/main/java/com/moral/controller/OrganizationSensorUnitController.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationSensorUnitController.java b/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
index 5158d46..12b5a97 100644
--- a/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
+++ b/src/main/java/com/moral/controller/OrganizationSensorUnitController.java
@@ -44,7 +44,7 @@
resultData.put("sensorUnitMap",sensorUnitMap);
}else {
resultData.put("osuList",new ArrayList<>()); // ���������������������
- resultData.put("sensorUnitMap",new Object()); // ������������
+ resultData.put("sensorUnitMap",new HashMap<>()); // ������������
}
return new ResultBean(resultData);
}
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 527b123..0ab1c6f 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -77,14 +77,14 @@
@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);
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