|
@@ -240,8 +240,8 @@ public class NoticeServiceImpl implements NoticeService {
|
|
@Override
|
|
@Override
|
|
public List<NoticeRulePublishProgressEntity> getToBeDisposedNoticeRulePublishProgressList() {
|
|
public List<NoticeRulePublishProgressEntity> getToBeDisposedNoticeRulePublishProgressList() {
|
|
List<NoticeRulePublishProgressEntity> resultList = null;
|
|
List<NoticeRulePublishProgressEntity> resultList = null;
|
|
- List<NoticeEntity> publishingNoticeList = noticeRepo.findNoticeStatus(NoticeStatus.PUBLISHING);
|
|
|
|
- List<NoticeEntity> toBePublishedNoticeList = noticeRepo.findNoticeStatus(NoticeStatus.TO_BE_PUBLISHED);
|
|
|
|
|
|
+ List<NoticeEntity> publishingNoticeList = noticeRepo.findByNoticeStatus(NoticeStatus.PUBLISHING);
|
|
|
|
+ List<NoticeEntity> toBePublishedNoticeList = noticeRepo.findByNoticeStatus(NoticeStatus.TO_BE_PUBLISHED);
|
|
List<Long> noticeIdList = new ArrayList<>();
|
|
List<Long> noticeIdList = new ArrayList<>();
|
|
if (publishingNoticeList != null && !publishingNoticeList.isEmpty()) {
|
|
if (publishingNoticeList != null && !publishingNoticeList.isEmpty()) {
|
|
noticeIdList = publishingNoticeList.stream().map(p -> p.getId()).collect(Collectors.toList());
|
|
noticeIdList = publishingNoticeList.stream().map(p -> p.getId()).collect(Collectors.toList());
|