k94314517
2024-06-28 43db8d016dc5079da163c02a6e7d63185c78b3af
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());