From 0360073c44987036d9850c0a310567f662a16df2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 18:41:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
index 2a6d37b..013feaa 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -233,12 +233,11 @@
;
IPage<Notice> noticeIPage = noticeMapper.selectPage(page, queryWrapper);
List<NoticeCardDTO> noticeCardDTOs = new ArrayList<>();
- if (CollectionUtils.isEmpty(noticeIPage.getRecords())){
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticeIPage.getRecords())){
noticeCardDTOs = noticeIPage.getRecords().stream().map(s -> {
NoticeCardDTO noticeCardDTO = new NoticeCardDTO();
BeanUtils.copyProperties(s, noticeCardDTO);
return noticeCardDTO;
-
}).collect(Collectors.toList());
}
PageData<NoticeCardDTO> pageData = new PageData<>();
--
Gitblit v1.9.3