From bb4d7a049179f4a844a20fd01366489134ccb1d6 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Wed, 2 Apr 2025 19:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yg/df/service/BsSgcDfFzrService.java  | 28 ++++++++++---------
 .../kms/yg/sz/service/BsSgcSzFzrService.java  | 28 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
index 94b5a0b0..844adab4 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java
@@ -137,26 +137,28 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
         pieDtos.addAll(listType3);
 
         HashMap<String, HashMap<String,String>> map = new HashMap<>();
-
-        for (int i = 0; i < pieDtos.size(); i++) {
-            List<HashMap<String, String>> hashMaps = new ArrayList<>();
-            HashMap<String, String> hashMap = new HashMap<>();
-            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
-            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
-            for (int j = 0; j < pieDtos.size(); j++) {
-                if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
-
-                    hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
+        if (CollectionUtil.isNotEmpty(pieDtos)) {
+            for (int i = 0; i < pieDtos.size(); i++) {
+                List<HashMap<String, String>> hashMaps = new ArrayList<>();
+                HashMap<String, String> hashMap = new HashMap<>();
+                hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+                hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+                for (int j = 0; j < pieDtos.size(); j++) {
+                    if (StringUtils.isNotEmpty(pieDtos.get(j).getName()) && StringUtils.isNotEmpty(pieDtos.get(i).getName()) && StringUtils.isNotEmpty(pieDtos.get(j).getType())) {
+                        if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
+
+                            hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
+                        }
+                    }
                 }
-            }
-            map.put(pieDtos.get(i).getName(), hashMap);
+                map.put(pieDtos.get(i).getName(), hashMap);
 
+            }
         }
 
 
 
 
-
         return map;
 
     }
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
index d28a4854..5c965295 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java
@@ -132,32 +132,34 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
         List<PieDto> listType3 = bsSgcSzFzrMapper.getType3(layer, sysXzqhService.getSubString(xzqh),wagaCode);
 
         List<PieDto> pieDtos = new ArrayList<>();
+
         pieDtos.addAll(listType1);
 
         pieDtos.addAll(listType2);
         pieDtos.addAll(listType3);
 
         HashMap<String, HashMap<String,String>> map = new HashMap<>();
-
-        for (int i = 0; i < pieDtos.size(); i++) {
-            List<HashMap<String, String>> hashMaps = new ArrayList<>();
-            HashMap<String, String> hashMap = new HashMap<>();
-            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
-            hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
-            for (int j = 0; j < pieDtos.size(); j++) {
-                if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
-
-                    hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
+        if (CollectionUtil.isNotEmpty(pieDtos)) {
+            for (int i = 0; i < pieDtos.size(); i++) {
+                List<HashMap<String, String>> hashMaps = new ArrayList<>();
+                HashMap<String, String> hashMap = new HashMap<>();
+                hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+                hashMap.put(pieDtos.get(i).getType(), pieDtos.get(i).getNum());
+                for (int j = 0; j < pieDtos.size(); j++) {
+                    if (StringUtils.isNotEmpty(pieDtos.get(j).getName()) && StringUtils.isNotEmpty(pieDtos.get(i).getName()) && StringUtils.isNotEmpty(pieDtos.get(j).getType())) {
+                        if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getType().equals(pieDtos.get(i).getType())) {
+                            hashMap.put(pieDtos.get(j).getType(), pieDtos.get(j).getNum());
+                        }
+                    }
                 }
-            }
-            map.put(pieDtos.get(i).getName(), hashMap);
+                map.put(pieDtos.get(i).getName(), hashMap);
 
+            }
         }
 
 
 
 
-
         return map;
 
     }