From b0284022c1397515e4ff0439ef408c876bbec5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 7 Apr 2023 14:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=AF=BC=E5=87=BA=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SalaryAcctExcelServiceImpl.java      | 11 ++++-------
 .../salary/wrapper/SalaryAcctResultWrapper.java       |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index be49a93d5..11bb3bd78 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -2,7 +2,6 @@ package com.engine.salary.service.impl;
 
 import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.cloudstore.dev.api.util.Util_DataCache;
-import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.component.WeaTableColumnGroup;
@@ -41,7 +40,6 @@ import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.excel.ExcelParseHelper;
 import com.engine.salary.util.excel.ExcelSupport;
-import com.engine.salary.util.excel.ExcelUtil;
 import com.engine.salary.util.excel.ExcelUtilPlus;
 import com.engine.salary.util.page.Column;
 import com.engine.salary.util.valid.ValidUtil;
@@ -54,11 +52,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.file.ImageFileManager;
 import weaver.hrm.User;
@@ -300,8 +295,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) {
             total = true;
             Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
-            sumRow.put("taxAgentName", "总计");
-            resultMapList.add(sumRow);
+            if(sumRow !=null){
+                sumRow.put("taxAgentName", "总计");
+                resultMapList.add(sumRow);
+            }
         }
 
         // excel导出的数据
diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
index 0d01aff15..1b4a210fd 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
@@ -17,7 +17,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
-import com.engine.salary.sys.entity.po.SalarySysConfPO;
 import com.engine.salary.sys.service.SalarySysConfService;
 import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
 import com.engine.salary.util.SalaryEntityUtil;
@@ -32,8 +31,6 @@ import weaver.hrm.User;
 import java.math.BigDecimal;
 import java.util.*;
 
-import static com.engine.salary.sys.constant.SalarySysConstant.OPEN_ACCT_RESULT_SUM;
-
 /**
  * 薪资核算结果
  * <p>Copyright: Copyright (c) 2022</p>
@@ -125,7 +122,7 @@ public class SalaryAcctResultWrapper extends Service {
         Map<String, Object> datas = new HashMap<>();
 
         //合计
-        SalarySysConfPO openSum = getSalarySysConfService(user).getOneByCode(OPEN_ACCT_RESULT_SUM);
+//        SalarySysConfPO openSum = getSalarySysConfService(user).getOneByCode(OPEN_ACCT_RESULT_SUM);
         Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
         datas.put("sumRow", sumRow);
         return datas;