From f4c7d769f06ff119e650a0a2b1f00e73324d5b7c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 29 十月 2025 13:58:24 +0800
Subject: [PATCH] yys 1.修改大屏接口bug
---
 src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
index ec1f077..a7ab8cf 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -25,10 +25,7 @@
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @AllArgsConstructor
 @Service
@@ -132,11 +129,13 @@
                     .eq(AccountIncome::getInputTime, date.toString()))
                     .stream()
                     .map(AccountIncome::getIncomeMoney)
+                    .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             BigDecimal totalExpense = accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
                     .eq(AccountExpense::getInputTime, date.toString()))
                     .stream()
                     .map(AccountExpense::getExpenseMoney)
+                    .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
             BigDecimal netIncome = totalIncome.subtract(totalExpense);
             days.add(date.toString());
--
Gitblit v1.9.3