|
@@ -39,8 +39,8 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
|
|
|
.eq(ObjectUtil.isNotNull(status), NewsEntity::getStatus, status)
|
|
|
.like(StrUtil.isNotBlank(title), NewsEntity::getTitle, title)
|
|
|
.eq(NewsEntity::getIsDelete, IsDeleteEnum.NORMAL.value())
|
|
|
- .between(ObjectUtil.isNotNull(publishStartTime) && ObjectUtil.isNotNull(publishEndTime),
|
|
|
- NewsEntity::getPublishTime, publishStartTime, publishEndTime)
|
|
|
+ .ge(ObjectUtil.isNotNull(publishStartTime), NewsEntity::getPublishTime, publishStartTime)
|
|
|
+ .le(ObjectUtil.isNotNull(publishEndTime), NewsEntity::getPublishTime, publishEndTime)
|
|
|
.orderByDesc(NewsEntity::getCreateTime));
|
|
|
return new PageUtils(page);
|
|
|
}
|