From 43db8d016dc5079da163c02a6e7d63185c78b3af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码初始化

---
 server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java |    4 ++--
 1 files changed, 2 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 68ab7e8..23d63ba 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
@@ -158,10 +158,12 @@
         if(noticesDTO.getQueryType().equals(Constants.ZERO)){
             queryWrapper.eq(Notices::getStatus,Constants.ZERO);
             queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
+            queryWrapper.eq(Notices::getParam2,Constants.ZERO);
             queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
         } else if(noticesDTO.getQueryType().equals(Constants.ONE)){
             queryWrapper.eq(Notices::getStatus,Constants.ONE);
             queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
+            queryWrapper.eq(Notices::getParam4,noticesDTO.getMemberId());
         } else if(noticesDTO.getQueryType().equals(Constants.TWO)){
             queryWrapper.eq(Notices::getParam3, noticesDTO.getMemberId());
         } else if (noticesDTO.getQueryType().equals(Constants.THREE)) {
@@ -174,8 +176,6 @@
             queryWrapper.eq("1","2");
         }
         queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ));
-        queryWrapper.le(noticesDTO.getStartDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getStartDate() ));
-        queryWrapper.ge(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getEndDate() ));
         queryWrapper.le(noticesDTO.getEndDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ));
         queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
         queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());

--
Gitblit v1.9.3