diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java index ca746b9..ef67461 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java @@ -3,7 +3,6 @@ package com.chinaunicom.mall.ebtp.extend.bizbidnotice.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; @@ -41,9 +40,11 @@ public class BizBidNoticeServiceImpl extends BaseServiceImpl page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); listRelease(page.getRecords()); return page; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java index ab7a5a3..2f2e235 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java @@ -39,9 +39,12 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(bizBidNotice.getSharedName()), BizBidShared::getSharedName, bizBidNotice.getSharedName()) .like(StrUtil.isNotEmpty(bizBidNotice.getSharedRole()), BizBidShared::getSharedRole, bizBidNotice.getSharedRole()) - .between(bizBidNotice.getCreateDate() != null, BizBidShared::getCreateDate, bizBidNotice.getCreateDate(),bizBidNotice.getCreateDate().plusDays(1L)) .orderByDesc(BizBidShared::getCreateDate); + if (bizBidNotice.getCreateDate() != null) { + wrapper.between(BizBidShared::getCreateDate, bizBidNotice.getCreateDate(), bizBidNotice.getCreateDate().plusDays(1L)); + } + Page page = this.page(new Page<>(bizBidNotice.getPageNo(), bizBidNotice.getPageSize()), wrapper); List collect = page.getRecords().stream().map(BizBidShared::getSharedFile).distinct().collect(Collectors.toList()); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java index 5fae2b6..ba920be 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/service/impl/BizBidSharedRecordServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.dao.BizBidSharedRecordMapper; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecord; import com.chinaunicom.mall.ebtp.extend.bizbidsharedrecord.entity.BizBidSharedRecordVO; @@ -35,9 +34,10 @@ public class BizBidSharedRecordServiceImpl extends BaseServiceImpl(recordVO.getPageNo(), recordVO.getPageSize()), wrapper); }