From 1567ecb9565da66e8021ba7a3dbb2988d950d225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 24 Aug 2022 14:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E7=BB=93=E6=9E=9C=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5bug=EF=BC=8Cnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryAcctExcelServiceImpl.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 17216bddb..009faaf99 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -37,6 +37,7 @@ import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.wbi.util.Util;
 import dm.jdbc.util.IdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -265,6 +266,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
 
     /**
      * 报表表头
+     *
      * @param salaryAcctRecordPO
      * @return
      */
@@ -733,10 +735,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                     }
 
                     for (SalaryAcctResultReportPO po : salaryAcctResultReportOfOneEmp) {
-                        po.setEmployeeId(employeeId.toString());
+                        po.setEmployeeId(Util.null2String(employeeId));
                         po.setTaxAgentId(taxAgentId);
-                        po.setSalaryAcctEmpId(salaryAcctEmpId.toString());
-
+                        po.setSalaryAcctEmpId(Util.null2String(salaryAcctEmpId));
 
                         DataCollectionEmployee emp = emps.get(employeeId);
                         po.setSubcompanyId(emp.getSubcompanyid());