From 6928005f010ece3be270c1c34b48a5df460e61ba Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 30 Nov 2023 09:21:16 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InsideOutsideMeetingServiceImpl.java | 4 +++- .../service/impl/SarLawsInformationServiceImpl.java | 4 +++- .../service/impl/SarLawsTopicServiceImpl.java | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) 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);