From b20fd29dc3864405af4afa0aeb99d13d74fbfcdc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 21 三月 2024 15:07:44 +0800
Subject: [PATCH] 解决导出xls异常
---
src/main/java/com/lf/server/service/sys/ReportService.java | 2 --
src/main/java/com/lf/server/helper/ExcelHelper.java | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/ExcelHelper.java b/src/main/java/com/lf/server/helper/ExcelHelper.java
index d0abdca..5589cdd 100644
--- a/src/main/java/com/lf/server/helper/ExcelHelper.java
+++ b/src/main/java/com/lf/server/helper/ExcelHelper.java
@@ -90,8 +90,12 @@
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
// 鍐欏叆鏁版嵁
- excelWriter.fill(map, writeSheet);
- listMap.forEach((k, v) -> excelWriter.fill(new FillWrapper(k, v), fillConfig, writeSheet));
+ if (null != map && map.size() > 0) {
+ excelWriter.fill(map, writeSheet);
+ }
+ if (null != listMap && listMap.size() > 0) {
+ listMap.forEach((k, v) -> excelWriter.fill(new FillWrapper(k, v), fillConfig, writeSheet));
+ }
// 缁撴潫鍐欏叆
excelWriter.finish();
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index a870950..376bd4c 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -410,8 +410,6 @@
if (!StringHelper.isEmpty(code)) {
map.put("title", dirService.selectNameByCode(code));
list.remove(list.size() - 1);
- }
- if (null != code) {
for (CountEntity ce : list) {
ce.setM2("count".equals(ce.getM2()) ? ce.getCount() + "涓�" : ("area".equals(ce.getM2()) ? ce.getM3() : ce.getLen() + "鍗冪背"));
}
--
Gitblit v1.9.3