|
|
@@ -74,7 +74,6 @@ public class NewsController {
|
|
|
@ApiOperation(value = "获取新闻分页")
|
|
|
public RT<PageOutput<NewsPageVo>> box(NewsPageDto dto) {
|
|
|
MPJLambdaWrapper<News> wrapper = MPJWrappers.<News>lambdaJoin()
|
|
|
- .distinct()
|
|
|
.eq(ObjectUtil.isNotEmpty(dto.getType()) && dto.getType() > 0, News::getTypeId, dto.getType())
|
|
|
.and(wq -> wq.eq(News::getLevel, 1).or().eq(News::getLevel, 2).eq(News::getClassId, dto.getClassId()))
|
|
|
.eq(ObjectUtil.isNotEmpty(dto.getLevel()) && dto.getLevel() > 0, News::getLevel, dto.getLevel())
|
|
|
@@ -83,8 +82,8 @@ public class NewsController {
|
|
|
// .leftJoin(NewsRelation.class, onWrapper -> onWrapper.eq(NewsRelation::getNewsId, News::getId).eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong()))
|
|
|
// .selectAs(NewsRelation::getId, NewsPageVo::getReadId)
|
|
|
.selectAs(News::getId, NewsPageVo::getId)
|
|
|
- .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()));
|
|
|
- //.orderByDesc(News::getCreateDate);//新闻按照创建时间倒序排
|
|
|
+ .select(News.class, x -> VoToColumnUtil.fieldsToColumns(NewsPageVo.class).contains(x.getProperty()))
|
|
|
+ .orderByDesc(News::getCreateDate);//新闻按照创建时间倒序排
|
|
|
IPage<NewsPageVo> page = newsService.selectJoinListPage(ConventPage.getPage(dto), NewsPageVo.class, wrapper);
|
|
|
PageOutput<NewsPageVo> pageOutput = ConventPage.getPageOutput(page, NewsPageVo.class);
|
|
|
return RT.ok(pageOutput);
|
