From 4e45a8252d7bccd23a1a57aa541a2ea521760572 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 21 十月 2024 15:39:04 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 6 ++---- 1 files changed, 2 insertions(+), 4 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 72df53c..fab1e36 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 @@ -120,7 +120,6 @@ if (pageWrap.getModel().getReaded() != null) { queryWrapper.eq(Notices::getReaded, pageWrap.getModel().getReaded()); } - if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){ for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { @@ -133,7 +132,6 @@ queryWrapper.orderByDesc(Notices::getCreateDate); } PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper)); - return pageData; } @@ -178,8 +176,8 @@ queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() )); queryWrapper.le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() )); queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType()); - queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId()); - queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle()); +// queryWrapper.eq(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId()); + queryWrapper.like(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle()); queryWrapper.orderByDesc(Notices::getCreateDate); PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper)); if(noticesDTO.getQueryType().equals(Constants.ZERO)){ -- Gitblit v1.9.3