From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口,添加界面左侧站点设备信息接口

---
 src/main/java/com/moral/common/util/ExportExcelUtils.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/common/util/ExportExcelUtils.java b/src/main/java/com/moral/common/util/ExportExcelUtils.java
index 1f9862e..ad8f571 100644
--- a/src/main/java/com/moral/common/util/ExportExcelUtils.java
+++ b/src/main/java/com/moral/common/util/ExportExcelUtils.java
@@ -64,7 +64,9 @@
 		for (int i = 0; i < list.size(); i++) {
 			JSONObject jsonObject = JSONObject.fromObject(list.get(i));
 			for (int j = 0; j < colTitles.length; j++) {
-				ws.addCell(new Label(j, i + 1, jsonObject.getString(fieldNames[j])));
+				if (jsonObject.containsKey(fieldNames[j])) {
+					ws.addCell(new Label(j, i + 1, jsonObject.getString(fieldNames[j])));
+				}
 			}
 		}
 	}

--
Gitblit v1.8.0