mjh 4 éve
szülő
commit
d971fcebe2

+ 4 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -91,7 +91,10 @@ public class AnnouncementService {
                     .map(courseId -> this.getAnnouncementsByCourseId(courseId).stream().map(AnnouncementVO::getId).collect(Collectors.toList()))
                     .map(courseId -> this.getAnnouncementsByCourseId(courseId).stream().map(AnnouncementVO::getId).collect(Collectors.toList()))
                     .collect(Collectors.toList())
                     .collect(Collectors.toList())
                     .forEach(announcementList::addAll);
                     .forEach(announcementList::addAll);
-            List<AnnouncementRecord> recordAnnouncements = announcementRecordRepository.findAnnouncementRecordsByRecipientId(userId);
+            List<AnnouncementRecord> recordAnnouncements = announcementRecordRepository.findAnnouncementRecordsByRecipientId(userId)
+                    .stream()
+                    .filter(announcementRecord -> this.getAnnouncementById(announcementRecord.getAnnouncementId()).getState() != ObjectState.DELETED)
+                    .collect(Collectors.toList());
             List<Long> recordButUnread = new ArrayList<>();
             List<Long> recordButUnread = new ArrayList<>();
 
 
             recordAnnouncements.forEach(announcementRecord -> {
             recordAnnouncements.forEach(announcementRecord -> {