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 fileMap) throws Exception { if (fileMap != null && fileMap.size() > 0) { List standFileList = new ArrayList<>(); + List fileList = new ArrayList<>(); for (Map.Entry entry : fileMap.entrySet()) { String value = entry.getValue(); String field = entry.getKey(); if (StringUtils.isNotBlank(value)) { - List 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 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); } }