From f41d94bbd9e45c29d4c052c54f9d0a7aea490b92 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 12 Jul 2021 11:02:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java              | 3 ++-
 .../java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index c432ee27..88d3d02f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -504,11 +504,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     public void createStandFile(String standId, Map<String, String> fileMap) throws Exception {
         if (fileMap != null && fileMap.size() > 0) {
             List<SarStandFile> standFileList = new ArrayList<>();
+            List<AttFileEO> fileList = new ArrayList<>();
             for (Map.Entry<String, String> entry : fileMap.entrySet()) {
                 String value = entry.getValue();
                 String field = entry.getKey();
                 if (StringUtils.isNotBlank(value)) {
-                    List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(value);
+                    fileList = attFileEOService.getMultiFileInfos(value);
                     if (fileList != null && !fileList.isEmpty()) {
                         createStandFileAppend(standId, field, fileList, standFileList);
                     }
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
index f2d24b35..e81fdfff 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
@@ -281,7 +281,7 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
                     if(StringUtils.isNotEmpty(idList[i])){
                         attFileEO.setId(idList[i]);
                         AttFileEO getFile = this.baseMapper.selectFileInfoById(attFileEO);
-                        if(attFileEO != null){
+                        if(attFileEO != null && getFile != null){
                             fileObj.add(getFile);
                         }
                     }