From d22083351243715e3e948ffc7cc9bc4a5957303b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Feb 2025 16:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E9=9D=9E?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98=E6=8A=A5=E8=A1=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/wrapper/SalaryStatisticsReportWrapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index c385a5b21..7d0d48d53 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -439,7 +439,7 @@ public class SalaryStatisticsReportWrapper extends Service {
                 Map<String, Object> countResultMap = (Map<String, Object>) result.get("countResult");
                 List<Map<String, Object>> list = page.getList();
                 // 获取数据
-                List<Map<String, Object>> records = list.stream().map(m -> m.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue()))).collect(Collectors.toList());
+                List<Map<String, Object>> records = list.stream().map(m -> m.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue() == null ? "" : e.getValue()))).collect(Collectors.toList());
                 records.add(countResultMap);
 
                 List rows = new ArrayList<>();