|
@@ -355,6 +355,7 @@ public class NewsController {
|
|
|
.leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
+ .gt(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.eq(News::getTypeId, typeId)
|
|
|
.eq(NewsRelation::getReadMark, 0)
|
|
|
);
|
|
@@ -379,6 +380,7 @@ public class NewsController {
|
|
|
.leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
+ .gt(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.eq(News::getTypeId, typeId)
|
|
|
.eq(NewsRelation::getReadMark, 0)
|
|
|
);
|
|
@@ -463,6 +465,7 @@ public class NewsController {
|
|
|
MPJWrappers.<News>lambdaJoin()
|
|
|
.leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
|
|
|
.eq(News::getStatus, 2)
|
|
|
+ .gt(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.eq(NewsRelation::getReadMark, 0)
|
|
|
);
|
|
|
|