|
|
@@ -413,7 +413,7 @@ public class NewsController {
|
|
|
|
|
|
if (news != null) {
|
|
|
newsCountTypeVo.setTime(news.getReleaseTime());
|
|
|
- newsCountTypeVo.setTitle(news.getBriefHead());
|
|
|
+ newsCountTypeVo.setTitle(news.getFullHead());
|
|
|
}
|
|
|
newsCountTypeVoList.add(newsCountTypeVo);
|
|
|
}
|
|
|
@@ -434,7 +434,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 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()));
|
|
|
|
|
|
//公告发给全体的
|
|
|
Long notReadCountProclamationToAll = newsService.count(Wrappers.<News>query().lambda()
|
phoenix