From 994e4acbbb90885f4a66979eacc775fb139403c0 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 20 Mar 2023 16:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index bf8ea9c6..2a199b25 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -3738,15 +3738,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if(asList.size()>0) {
             for (String fileId : asList) {
                 AttFileEO byId = attFileEOService.getFileInfo(fileId);
-                attFileEOS.add(byId);
+                if(byId!=null){
+                    attFileEOS.add(byId);
+                }
             }
         }
-        if(attFileEOS.size()>0) {
+        if(attFileEOS.size()>0 && !attFileEOS.isEmpty()) {
             for (AttFileEO data : attFileEOS) {
                 for (AttFileEO file : attFileEOS) {
-                    if (!data.getId().equals(file.getId())) {
-                        if (data.getOldFileName().equals(file.getOldFileName())) {
-                            attFileEOArrayList.add(data);
+                    if(data !=null && file !=null) {
+                        if (!data.getId().equals(file.getId())) {
+                            if (data.getOldFileName().equals(file.getOldFileName())) {
+                                attFileEOArrayList.add(data);
+                            }
                         }
                     }
                 }