From 65f57554229ea5d2d695d464eb766c54f93f8b9e Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Wed, 11 Feb 2026 10:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysMessageNoticeAppController.java  |  2 +-
 .../message/service/ISysMessageNoticeService.java  |  2 +-
 .../service/impl/SysMessageNoticeServiceImpl.java  | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/controller/SysMessageNoticeAppController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/controller/SysMessageNoticeAppController.java
index e15ad0e..4c6a97d 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/controller/SysMessageNoticeAppController.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/controller/SysMessageNoticeAppController.java
@@ -35,7 +35,7 @@ public class SysMessageNoticeAppController extends JeecgController<SysMessageNot
      */
     @Operation(summary = "消息通知-分页列表查询", description = "消息通知-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<List<SysMessageNoticeVO>> queryPageList(SysMessageNoticeQuery query,
+    public Result<List<SysMessageNotice>> queryPageList(SysMessageNoticeQuery query,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         Page<SysMessageNotice> page = new Page<>(pageNo, pageSize);
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/ISysMessageNoticeService.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/ISysMessageNoticeService.java
index cdab9af..b2ef10f 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/ISysMessageNoticeService.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/ISysMessageNoticeService.java
@@ -36,7 +36,7 @@ public interface ISysMessageNoticeService extends IService<SysMessageNotice> {
      * @param page 分页参数
      * @return 列表结果
      */
-    List<SysMessageNoticeVO> queryPageAppList(SysMessageNoticeQuery query, Page<SysMessageNotice> page);
+    List<SysMessageNotice> queryPageAppList(SysMessageNoticeQuery query, Page<SysMessageNotice> page);
 
     /**
      * 添加消息通知
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java
index 12f763e..75262bd 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java
@@ -64,14 +64,10 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl<SysMessageNoticeMap
     }
 
     @Override
-    public List<SysMessageNoticeVO> queryPageAppList(SysMessageNoticeQuery query, Page<SysMessageNotice> page) {
+    public List<SysMessageNotice> queryPageAppList(SysMessageNoticeQuery query, Page<SysMessageNotice> page) {
         LambdaQueryWrapper<SysMessageNotice> wrapper = new LambdaQueryWrapper<>();
         setQueryData(query, wrapper, NoticeConstants.QUERY_SOURCE_APP);
-        Page<SysMessageNotice> resultPage = this.page(page, wrapper);
-        if (CollUtil.isEmpty(resultPage.getRecords())) {
-            return new ArrayList<>();
-        }
-        return setResultData(resultPage.getRecords());
+        return this.page(page, wrapper).getRecords();
     }
 
     @Override
@@ -160,8 +156,10 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl<SysMessageNoticeMap
     private void setQueryData(SysMessageNoticeQuery query, LambdaQueryWrapper<SysMessageNotice> wrapper, Integer source) {
         // 设置权限过滤
         applyPermissionFilter(wrapper, source);
-        // 设置查询条件
-        applyQueryConditions(query, wrapper);
+        if (NoticeConstants.QUERY_SOURCE_ADMIN.equals(source)) {
+            // 设置查询条件
+            applyQueryConditions(query, wrapper);
+        }
         // 设置排序
         wrapper.orderByDesc(SysMessageNotice::getCreateTime);
     }