From 6e6fde89cb167c02dea09bb5c6606a4ade20b1de Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 5 Jun 2024 09:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=82=E7=AB=8B=E8=96=AA=E9=85=AC=E4=BA=8C?= =?UTF-8?q?=E5=BC=80-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/wrapper/SalaryAcctResultWrapper.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index b221da080..3a83c0e7f 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -215,7 +215,10 @@ public class SalaryAcctResultWrapper extends Service { String itemName = salaryItemMap.get(itemId); if (StringUtils.isNotBlank(itemName)) { List resultPOList = resultGroupByItemId.get(itemId); - BigDecimal sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal sumValue = new BigDecimal(0); + if (resultPOList != null) { + sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } Map resultItemMap = new HashMap<>(); resultItemMap.put("name", itemName); resultItemMap.put("id", itemId); @@ -246,8 +249,11 @@ public class SalaryAcctResultWrapper extends Service { String itemName = salaryItemMap.get(itemId); if (StringUtils.isNotBlank(itemName)) { List resultPOList = lastMonthResultGroupByItemId.get(itemId); - BigDecimal sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); - // lastRecordStr.append(" ").append(itemName).append(":").append(sumValue.toString()); + BigDecimal sumValue = new BigDecimal(0); + if (resultPOList != null) { + sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + } + // lastRecordStr.append(" ").append(itemName).append(":").append(sumValue.toString()); Map resultItemMap = new HashMap<>(); resultItemMap.put("name", itemName); resultItemMap.put("id", itemId);