修改bug

mitao

2024-07-15 5814d15a328979d3d97a65a8e6e3e70b5204ca32

 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;
@@ -97,6 +98,9 @@
                Member data = membeOne.getData();
                articleVO.setMemberNickname(data.getNickname());
                articleVO.setMemberAvatar(data.getAvatar());
            }else{
                    articleVO.setMemberNickname("平台发布");
                    articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
            }
            LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery();
            wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId());
@@ -161,17 +165,24 @@
    @Override
    public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
        Article article=this.getById(articleDTO.getId());
        if (StringUtils.isNull(article)) {
            throw new ServiceException("资讯不存在了");
        }
        ArticleVO articleVO = BeanUtils.copyBean(article,
                ArticleVO.class);
        R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
                SecurityConstants.INNER);
        Member data = membeOne.getData();
        if (data!=null){
            articleVO.setMemberNickname(data.getNickname());
            articleVO.setMemberAvatar(data.getAvatar());
        if(articleVO!=null){
            R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            if (data!=null){
                articleVO.setMemberNickname(data.getNickname());
                articleVO.setMemberAvatar(data.getAvatar());

            }
        }else{
            articleVO.setMemberNickname("平台发布");
            articleVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
        }

        LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId());
        wrapper1.eq(MemberLike::getArticleId,article.getId());
@@ -259,6 +270,7 @@
                    articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
                    articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
                    articleCommentsVO1.setBmemberNickname(data2.getNickname());
                    articleCommentsVO1.setBmemberNickavatar(data2.getNickname());
                    articleCommentsVO1.setState(articleComments1.getState());
                    articleCommentsVO1.setBmemberId(data2.getId());

@@ -336,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()));
@@ -365,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();
@@ -373,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()));
@@ -383,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());
@@ -392,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;
    }