Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 bf8d85d5f83c2036fb4239d764d33e99c1b62bd3

 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;