From 26908c2ceea2e7f9a2cc9fa224ad9079e35438d0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 19 Jul 2024 19:40:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyComeMoneyStatisticsController.java | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
index 4f8b2a75..e4ee8392 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
@@ -304,9 +304,11 @@ public class CompanyComeMoneyStatisticsController {
                 //获得单一年数据
                 List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey);
                 BigDecimal bigDecimal = new BigDecimal("0.00");
-                for (CompanyComeMoneyClassificationList list1 : dataList) {
-                    String allMoney = list1.getAllMoney();
-                    bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                if (dataList != null){
+                    for (CompanyComeMoneyClassificationList list1 : dataList) {
+                        String allMoney = list1.getAllMoney();
+                        bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                    }
                 }
                 lm.put(yearKey, bigDecimal.toString());
                 String allStr = allMap.get(yearKey);
@@ -319,10 +321,12 @@ public class CompanyComeMoneyStatisticsController {
                 for (DictModel dictModel : dictModels) {
                     BigDecimal bigDecimal = new BigDecimal("0.00");
                     String value = dictModel.getValue();
-                    for (CompanyComeMoneyClassificationList list2 : dataList) {
-                        if (list2.getChargeUse().equals(value)) {
-                            String allMoney = list2.getAllMoney();
-                            bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                    if (dataList != null){
+                        for (CompanyComeMoneyClassificationList list2 : dataList) {
+                            if (list2.getChargeUse().equals(value)) {
+                                String allMoney = list2.getAllMoney();
+                                bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                            }
                         }
                     }
                     String key = yearKey + "_" + value;
@@ -413,9 +417,11 @@ public class CompanyComeMoneyStatisticsController {
                 //获得单一年数据
                 List<CompanyComeMoneyClassificationList> dataList = yearKeyMap.get(yearKey);
                 BigDecimal bigDecimal = new BigDecimal("0.00");
-                for (CompanyComeMoneyClassificationList list1 : dataList) {
-                    String allMoney = list1.getAllMoney();
-                    bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                if (dataList != null){
+                    for (CompanyComeMoneyClassificationList list1 : dataList) {
+                        String allMoney = list1.getAllMoney();
+                        bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                    }
                 }
                 lm.put("je_"+yearKey, bigDecimal.toString());
             }
@@ -425,10 +431,12 @@ public class CompanyComeMoneyStatisticsController {
                 for (DictModel dictModel : dictModels) {
                     BigDecimal bigDecimal = new BigDecimal("0.00");
                     String value = dictModel.getValue();
-                    for (CompanyComeMoneyClassificationList list2 : dataList) {
-                        if (list2.getChargeUse().equals(value)) {
-                            String allMoney = list2.getAllMoney();
-                            bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                    if (dataList != null){
+                        for (CompanyComeMoneyClassificationList list2 : dataList) {
+                            if (list2.getChargeUse().equals(value)) {
+                                String allMoney = list2.getAllMoney();
+                                bigDecimal = bigDecimal.add(new BigDecimal(allMoney));
+                            }
                         }
                     }
                     lm.put("je_"+yearKey+"_"+value, bigDecimal.toString());