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 ServiceImpl0) { 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); + } } } }