From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..f1f02a5 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
@@ -31,6 +31,7 @@
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.MemberDTO;
@@ -212,6 +213,8 @@
@Override
public PageDTO<ArticleCommentsVO> getArticleCommentsList(ArticleDTO articleDTO) {
+ Long userId = SecurityUtils.getUserId();
+ Member member = memberClient.getMemberByUserId(userId, SecurityConstants.INNER).getData();
Page<ArticleComments> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
LambdaQueryWrapper< ArticleComments> wrapper= Wrappers.lambdaQuery();
wrapper.eq(ArticleComments::getArticleId,articleDTO.getId());
@@ -236,7 +239,7 @@
}
LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
+ wrapper1.eq(MemberLike::getMemberId, member.getId());
wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getId());
wrapper1.eq(MemberLike::getType,2);
wrapper1.eq( MemberLike::getDelFlag,0);
@@ -371,6 +374,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 +428,8 @@
if (StringUtils.isNotNull(sysUser)) {
articleVO.setCreateBy(sysUser.getNickName());
articleVO.setPhone(sysUser.getPhonenumber());
+ } else {
+ articleVO.setCreateBy(null);
}
});
}
@@ -433,6 +440,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