Merge branch 'release/2.19.1.2501.01' into feature/重置排序

修复薪资核算筛选为空时导出报错
日志
2025-08-20 16:21:24 +08:00 · 2025-07-09 10:08:27 +08:00 · 2025-07-07 10:20:53 +08:00
2 changed files with 7 additions and 5 deletions
--- a/resource/WEB-INF/lib/hrmelog.jar
+++ b/resource/WEB-INF/lib/hrmelog.jar
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@ -405,11 +405,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 (sumRow != null) {
-                if (NumberUtils.isCreatable(v.toString())) {
+                sumRow.forEach((k, v) -> {
-                    sumRow.put(k, new BigDecimal(v.toString()));
+                    if (NumberUtils.isCreatable(v.toString())) {
-                }
+                        sumRow.put(k, new BigDecimal(v.toString()));
-            });
+                    }
                });
            }
            if (sumRow != null) {
                sumRow.put("taxAgentName", "总计");
                resultMapList.add(sumRow);
Author	SHA1	Message	Date
Harryxzy	1156b3f5dd	Merge branch 'release/2.19.1.2501.01' into feature/重置排序	2025-08-20 16:21:24 +08:00
Harryxzy	fb239f34ed	修复薪资核算筛选为空时导出报错	2025-07-09 10:08:27 +08:00
钱涛	8168a42b61	日志	2025-07-07 10:20:53 +08:00