From 28fff1f5191ffd5d1f00a8ed66fdad8c4f609712 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 29 Aug 2023 11:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A1=A3=E6=A1=88=EF=BC=8C=E9=9D=9E=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=AD=E9=83=A8=E9=97=A8=E4=B8=BA?=
 =?UTF-8?q?null=E5=A4=84=E7=90=86=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryArchiveExcelServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
index a3c51c7ca..4b45a13f1 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
@@ -343,7 +343,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
 //            row.add(e.get("incomeCategory").toString());
 //            row.add(e.get("salarySob").toString());
 //            row.add(e.get("hiredate"));
-                row.add(e.get("departmentName"));
+                row.add(Optional.ofNullable(e.get("departmentName")).orElse("").toString());
                 row.add(Optional.ofNullable(e.get("workcode")).orElse("").toString());
                 row.add(e.get("mobile") == null ? "" : e.get("mobile").toString());
                 row.add(Util.null2String(e.get("employeeStatus")));