From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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