设备

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/impl/DeviceServiceImpl.java

@@ -166,11 +166,11 @@ public class DeviceServiceImpl implements DeviceService {
         deviceDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         deviceDto.setPermissonType(loginUser.getPermissonType());
-        List<DeviceVo> deviceDtos = deviceMapper.selectList(deviceDto);
+        List<DeviceVo> deviceVoList = deviceMapper.selectList(deviceDto);
         Map<Long, DeviceVo> map = new HashMap<>();
         //数据清洗
         if (deviceDto.getSceneId() != null) {
-            for (DeviceVo item : deviceDtos) {
+            for (DeviceVo item : deviceVoList) {
                 if (!map.containsKey(item.getId())) {
                     map.put(item.getId(), item);
                 } else {
@@ -179,7 +179,7 @@ public class DeviceServiceImpl implements DeviceService {
             }
             return map.values().stream().collect(Collectors.toList());
         }
-        return deviceDtos;
+        return deviceVoList;
 
     }