From 5814d15a328979d3d97a65a8e6e3e70b5204ca32 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 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 5fdd992..9f8a426 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
@@ -39,6 +39,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -347,6 +348,8 @@
.in(StringUtils.isNotEmpty(memberIdSet), Article::getMemberId, memberIdSet)
.eq(StringUtils.isNotNull(query.getListingStatus()), Article::getListingStatus,
query.getListingStatus())
+ .eq(StringUtils.isNotNull(query.getArticleType()), Article::getArticleType,
+ query.getArticleType())
.like(StringUtils.isNotBlank(query.getTitle()), Article::getTitle, query.getTitle())
.orderByDesc(Article::getReported)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
@@ -376,6 +379,10 @@
Set<Long> memIds = voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING)).map(MgtArticleVO::getMemberId).collect(
Collectors.toSet());
+ Set<Long> memIds2 = voList.stream().map(MgtArticleVO::getReportBy).filter(
+ Objects::nonNull).map(Long::valueOf).collect(
+ Collectors.toSet());
+ memIds.addAll(memIds2);
if (StringUtils.isNotEmpty(memIds)) {
List<Member> memberList = memberClient.getMemberListByIds(memIds,
SecurityConstants.INNER).getData();
@@ -384,7 +391,7 @@
} else {
memberMap = null;
}
- if (StringUtils.isNotNull(userMap)) {
+ if (StringUtils.isNotEmpty(userMap)) {
voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.PLATFORM_RELEASE)).forEach(articleVO -> {
SysUser sysUser = userMap.get(Long.valueOf(articleVO.getCreateBy()));
@@ -394,7 +401,7 @@
}
});
}
- if (StringUtils.isNotNull(memberMap)) {
+ if (StringUtils.isNotEmpty(memberMap)) {
voList.stream().filter(articleVO -> articleVO.getArticleType()
.equals(ArticleTypeEnum.USER_POSTING)).forEach(articleVO -> {
Member member = memberMap.get(articleVO.getMemberId());
@@ -403,6 +410,13 @@
articleVO.setPhone(member.getPhone());
}
});
+ voList.stream().filter(articleVO -> articleVO.getReported().equals(Boolean.TRUE))
+ .peek(articleVO -> {
+ Member member = memberMap.get(Long.valueOf(articleVO.getReportBy()));
+ if (StringUtils.isNotNull(member)) {
+ articleVO.setReportBy(member.getNickname());
+ }
+ }).collect(Collectors.toList());
}
return pageVO;
}
--
Gitblit v1.7.1