|
|
@@ -339,7 +339,7 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.eq(News::getWfStatus, 1)
|
|
|
- .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ //.notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.orderByDesc(News::getReleaseTime)
|
|
|
.last("limit 1"));
|
|
|
}
|
|
|
@@ -360,7 +360,7 @@ public class NewsController {
|
|
|
.eq(News::getTypeId, 2)
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(News::getSendRange, 1)
|
|
|
- .notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
+ //.notInSql(News::getId, "select distinct news_id from xjr_oa_news_relation where read_mark = 1 and user_id = " + StpUtil.getLoginIdAsLong())
|
|
|
.and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.or()
|
|
|
.isNull(News::getSendEndDate))
|
|
|
@@ -373,7 +373,6 @@ public class NewsController {
|
|
|
.eq(NewsRelation::getUserId, 2)
|
|
|
.inSql(NewsRelation::getNewsId, "select id from xjr_oa_news where delete_mark = 0 and type_id = 2 and (send_range = 2 or send_range = 3) AND (send_end_date > '" + LocalDateTime.now() + "' OR send_end_date IS NULL)"));
|
|
|
|
|
|
-
|
|
|
MPJLambdaWrapper<News> queryNews = new MPJLambdaWrapper<>();
|
|
|
queryNews
|
|
|
.leftJoin(NewsRelation.class, NewsRelation::getNewsId, News::getId)
|
|
|
@@ -385,13 +384,12 @@ public class NewsController {
|
|
|
.and(wp -> wp.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.or()
|
|
|
.isNull(News::getSendEndDate))
|
|
|
- .eq(NewsRelation::getReadMark, 0)
|
|
|
+ //.eq(NewsRelation::getReadMark, 0)
|
|
|
.eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.orderByDesc(News::getReleaseTime)
|
|
|
.last("limit 1");
|
|
|
-
|
|
|
-
|
|
|
News newsNotAll = newsService.selectJoinOne(News.class, queryNews);
|
|
|
+
|
|
|
if(newsAll != null && newsNotAll != null){
|
|
|
if(newsAll.getReleaseTime().compareTo(newsNotAll.getReleaseTime()) < 0){
|
|
|
news = newsNotAll;
|
phoenix