From 74202ac7330d34d32212a13238a4da027349c7fb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:21 +0800
Subject: [PATCH] 登录时过期时间为null处理。

---
 src/main/java/com/moral/controller/ReportController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index cc8922a..ed398a7 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -50,7 +50,7 @@
 	public ResultBean<Boolean> getExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-		List<String> sensors= new ArrayList<String>((Set<String>) parameters.get("sensors"));
+		List<String> sensors= (List<String>) parameters.get("sensors");
 		String[][] exportColumn = new String[sensors.size() + 1][];
 		exportColumn[0] = new String[] { "������", "20", "time" };
 		for (int index = 0; index < sensors.size(); index++) {

--
Gitblit v1.8.0