|
|
@@ -366,6 +366,8 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.eq(News::getTypeId, typeId)
|
|
|
+ .eq(News::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
+ .eq(News::getEnabledMark, EnabledMark.ENABLED.getCode())
|
|
|
.eq(NewsRelation::getReadMark, 0)
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
);
|
|
|
@@ -393,6 +395,8 @@ public class NewsController {
|
|
|
.eq(News::getStatus, 2)
|
|
|
.eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
.eq(News::getTypeId, typeId)
|
|
|
+ .eq(News::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
+ .eq(News::getEnabledMark, EnabledMark.ENABLED.getCode())
|
|
|
.gt(News::getSendEndDate, LocalDateTime.now())
|
|
|
.eq(NewsRelation::getReadMark, 0)
|
|
|
);
|
