From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 39b4ee6..5e5cd79 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -371,6 +371,8 @@
query.getListingStatus())
.eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
query.getArticleType())
+ .eq(StringUtils.isNotNull(query.getStatus()), Article::getStatus,
+ query.getStatus())
.in(StringUtils.isNotNull(query.getArticleType()) && query.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING), Article::getStatus,
Lists.newArrayList(AuditStatusEnum.TO_BE_REVIEWED,
@@ -423,6 +425,8 @@
if (StringUtils.isNotNull(sysUser)) {
articleVO.setCreateBy(sysUser.getNickName());
articleVO.setPhone(sysUser.getPhonenumber());
+ } else {
+ articleVO.setCreateBy(null);
}
});
}
@@ -433,6 +437,8 @@
if (StringUtils.isNotNull(member)) {
articleVO.setCreateBy(member.getNickname());
articleVO.setPhone(member.getPhone());
+ } else {
+ articleVO.setCreateBy(null);
}
});
voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
--
Gitblit v1.7.1