diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index 72a87f96..5b163a30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -75,7 +75,9 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl meetingMinutesList = new ArrayList<>(); for (String attId : insideOutsideMeeting.getMeetingMinutes().split(",")) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - meetingMinutesList.add(fileInfo); + if (fileInfo != null) { + meetingMinutesList.add(fileInfo); + } } insideOutsideMeeting.setMeetingMinutesList(meetingMinutesList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 0aafa16e..54c4be20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -89,7 +89,9 @@ public class SarLawsInformationServiceImpl extends ServiceImpl fileNameList = new ArrayList<>(); for (String attId : split) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - fileNameList.add(fileInfo); + if (fileInfo != null) { + fileNameList.add(fileInfo); + } } sarLawsInformation.setInformationFileList(fileNameList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index d225211e..fdf09eb5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -473,7 +473,9 @@ public class SarLawsTopicServiceImpl extends ServiceImpl fileList = new ArrayList<>(); for (String attId : fileAttId.split(",")) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - fileList.add(fileInfo); + if (fileInfo != null) { + fileList.add(fileInfo); + } } String setMethod = "set" + StringUtils.capitalize(field) + "List"; method = SarLawsTopic.class.getMethod(setMethod, List.class); @@ -497,7 +499,9 @@ public class SarLawsTopicServiceImpl extends ServiceImpl fileList = new ArrayList<>(); for (String attId : fileAttId.split(",")) { AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - fileList.add(fileInfo); + if (fileInfo != null) { + fileList.add(fileInfo); + } } String setMethod = "set" + StringUtils.capitalize(field) + "List"; method = SarLawsTopicVO.class.getMethod(setMethod, List.class);