From 8d738d847973e1184a704b5ca3d4f492bffdb03f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:01:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 b826520..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
@@ -283,11 +283,10 @@
if (data2!=null){
articleCommentsVO1.setBmemberNickname(data2.getNickname());
articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
+ articleCommentsVO1.setBmemberId(data2.getId());
}
articleCommentsVO1.setState(articleComments1.getState());
- articleCommentsVO1.setBmemberId(data2.getId());
-
LambdaQueryWrapper<MemberLike> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
wrapper3.eq(MemberLike::getArticleId,articleComments1.getId());
@@ -372,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,
@@ -424,6 +425,8 @@
if (StringUtils.isNotNull(sysUser)) {
articleVO.setCreateBy(sysUser.getNickName());
articleVO.setPhone(sysUser.getPhonenumber());
+ } else {
+ articleVO.setCreateBy(null);
}
});
}
@@ -434,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