From 5f9dfb4ccdc338aac429ee1364695e1079cd8d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 4 Feb 2026 09:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=AF=BC=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalary.properties        |  2 +-
 .../service/impl/SalaryAcctExcelServiceImpl.java  | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties
index d821d5c46..9d3b6004a 100644
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=2.12.2.2403.02.s
+version=2.12.3.2403.02.s
 openFormulaForcedEditing=false
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 10e671a2f..913ed3bb6 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
 import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.cloudstore.dev.api.util.Util_DataCache;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
@@ -412,11 +413,13 @@ 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.forEach((k, v) -> {
-                if (NumberUtils.isCreatable(v.toString())) {
-                    sumRow.put(k, new BigDecimal(v.toString()));
-                }
-            });
+            if (sumRow != null) {
+                sumRow.forEach((k, v) -> {
+                    if (NumberUtils.isCreatable(v.toString())) {
+                        sumRow.put(k, new BigDecimal(v.toString()));
+                    }
+                });
+            }
             if (sumRow != null) {
                 sumRow.put("taxAgentName", SalaryI18nUtil.getI18nLabel(user.getLanguage(),523, "总计"));
                 resultMapList.add(sumRow);
@@ -431,7 +434,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
             List<Object> row = Lists.newArrayListWithExpectedSize(headerColumnGroup.size());
             for (WeaTableColumnGroup weaTableColumn : headerColumnGroup) {
                 String fieldType = (String) map.getOrDefault(weaTableColumn.getColumn().toString() + DATA_TYPE_SUFFIX, StringUtils.EMPTY);
-                if (StringUtils.equals("number", fieldType)) {
+                if (StringUtils.equals("number", fieldType)&& map.get(weaTableColumn.getColumn()) != null && NumberUtil.isNumber(map.get(weaTableColumn.getColumn()).toString())) {
                     row.add(new BigDecimal(StringUtils.isBlank(map.get(weaTableColumn.getColumn()).toString()) ? "0" : map.get(weaTableColumn.getColumn()).toString()));
                 } else {
                     row.add(map.getOrDefault(weaTableColumn.getColumn(), StringUtils.EMPTY));