|
@@ -39,11 +39,11 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
|
|
|
IPage<NewsEntity> page = this.page(new Query<NewsEntity>().getPage(params),
|
|
IPage<NewsEntity> page = this.page(new Query<NewsEntity>().getPage(params),
|
|
|
new LambdaQueryWrapper<NewsEntity>()
|
|
new LambdaQueryWrapper<NewsEntity>()
|
|
|
.eq(ObjectUtil.isNotNull(status), NewsEntity::getStatus, status)
|
|
.eq(ObjectUtil.isNotNull(status), NewsEntity::getStatus, status)
|
|
|
- .eq(ObjectUtil.isNotNull(app), NewsEntity::getStatus, 1)
|
|
|
|
|
|
|
+ .eq(StrUtil.isNotBlank(app), NewsEntity::getStatus, 1)
|
|
|
.like(StrUtil.isNotBlank(title), NewsEntity::getTitle, title)
|
|
.like(StrUtil.isNotBlank(title), NewsEntity::getTitle, title)
|
|
|
.eq(NewsEntity::getIsDelete, IsDeleteEnum.NORMAL.value())
|
|
.eq(NewsEntity::getIsDelete, IsDeleteEnum.NORMAL.value())
|
|
|
- .ge(ObjectUtil.isNotNull(publishStartTime), NewsEntity::getPublishTime, publishStartTime)
|
|
|
|
|
- .le(ObjectUtil.isNotNull(publishEndTime), NewsEntity::getPublishTime, publishEndTime)
|
|
|
|
|
|
|
+ .ge(StrUtil.isNotBlank(publishStartTime), NewsEntity::getPublishTime, publishStartTime)
|
|
|
|
|
+ .le(StrUtil.isNotBlank(publishEndTime), NewsEntity::getPublishTime, publishEndTime)
|
|
|
.orderByAsc(NewsEntity::getSortNo)
|
|
.orderByAsc(NewsEntity::getSortNo)
|
|
|
.orderByDesc(NewsEntity::getCreateTime));
|
|
.orderByDesc(NewsEntity::getCreateTime));
|
|
|
return new PageUtils(page);
|
|
return new PageUtils(page);
|