From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 10 七月 2024 18:16:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
index 7d6996b..799d9df 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleCommentsServiceImpl.java
@@ -56,6 +56,7 @@
articleComments.setMemberId(articleCommentsDTO.getMemberId());
articleComments.setArticleId(articleCommentsDTO.getArticleId());
articleComments.setContent(articleCommentsDTO.getContent());
+ articleComments.setState(articleCommentsDTO.getState());
articleComments.setType(1);
}else{
articleComments.setMemberId(articleCommentsDTO.getMemberId());
@@ -63,6 +64,7 @@
articleComments.setReplyId(articleCommentsDTO.getReplyId());
articleComments.setContent(articleCommentsDTO.getContent());
articleComments.setBmemberId(articleCommentsDTO.getBmemberId());
+ articleComments.setState(articleCommentsDTO.getState());
articleComments.setType(2);
}
Article byId = articleMapper.selectById(articleCommentsDTO.getArticleId());
@@ -92,19 +94,22 @@
public PageDTO<MgtArticleCommentsVO> getArticleCommentsPage(MgtArticleCommentsQuery query) {
PageDTO<MgtArticleCommentsVO> result;
Set<Long> memberIdSet = null;
+ Page<ArticleComments> page = new Page<>(query.getPageCurr(), query.getPageSize());
if (StringUtils.isNotBlank(query.getNickname())) {
MemberDTO memberDTO = new MemberDTO();
memberDTO.setNickname(query.getNickname());
List<Member> data = memberClient.getMemberListByCondition(memberDTO,
SecurityConstants.INNER).getData();
- if (StringUtils.isNotEmpty(data)) {
- memberIdSet = data.stream().map(Member::getId)
- .collect(Collectors.toSet());
+ if (StringUtils.isEmpty(data)) {
+ // 搜索结果为空，直接返回空
+ return PageDTO.empty(page);
}
+ memberIdSet = data.stream().map(Member::getId).collect(Collectors.toSet());
}
- Page<ArticleComments> page = this.lambdaQuery()
+ page = this.lambdaQuery()
.eq(ArticleComments::getArticleId, query.getArticleId())
.in(StringUtils.isNotEmpty(memberIdSet), ArticleComments::getMemberId, memberIdSet)
+ .orderByDesc(ArticleComments::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
result = PageDTO.empty(page);
--
Gitblit v1.7.1