From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 31 五月 2024 14:53:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java index 6eaf6f6..67cbee2 100644 --- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java +++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java @@ -95,7 +95,6 @@ Utils.MP.blankToNull(pageWrap.getModel()); LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - queryWrapper.selectAll(Notices.class); if (pageWrap.getModel().getIsdeleted() != null) { queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted()); @@ -130,7 +129,6 @@ }else{ queryWrapper.orderByDesc(Notices::getCreateDate); } - PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper)); return pageData; -- Gitblit v1.9.3