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());