Merge remote-tracking branch 'origin/master'

mitao

2024-07-17 e2659d65be6494f9f737cddcec8292ac39cc5c06

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -36,6 +36,7 @@
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -225,8 +226,14 @@
                R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleCommentsVO.setMemberNickname(data.getNickname());
                articleCommentsVO.setMemberNickavatar(data.getAvatar());
                if (data!=null){
                    articleCommentsVO.setMemberNickname(data.getNickname());
                    articleCommentsVO.setMemberNickavatar(data.getAvatar());
                }else{
                    articleCommentsVO.setMemberNickname("平台发布");
                    articleCommentsVO.setMemberNickavatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                }

                LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(MemberLike::getMemberId,articleCommentsVO.getMemberId());
                wrapper1.eq(MemberLike::getArticleId,articleCommentsVO.getId());
@@ -264,13 +271,19 @@
                    articleCommentsVO1.setContent(articleComments1.getContent());
                    articleCommentsVO1.setMemberId(articleComments1.getMemberId());
                    articleCommentsVO1.setId(articleComments1.getId());
                    articleCommentsVO1.setMemberNickname(data1.getNickname());
                    articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    articleCommentsVO1.setBmemberNickavatar(data1.getAvatar());
                    if (data1!=null){
                        articleCommentsVO1.setMemberNickname(data1.getNickname());
                        articleCommentsVO1.setMemberNickavatar(data1.getAvatar());
                    }


                    articleCommentsVO1.setLikeCount(articleComments1.getLikeCount());
                    articleCommentsVO1.setCreateTime(articleComments1.getCreateTime());
                    articleCommentsVO1.setBmemberNickname(data2.getNickname());
                    articleCommentsVO1.setBmemberNickavatar(data2.getNickname());
                    if (data2!=null){
                        articleCommentsVO1.setBmemberNickname(data2.getNickname());
                        articleCommentsVO1.setBmemberNickavatar(data2.getAvatar());
                    }

                    articleCommentsVO1.setState(articleComments1.getState());
                    articleCommentsVO1.setBmemberId(data2.getId());

@@ -285,7 +298,10 @@
                    }else {
                        articleCommentsVO1.setIslike(2);
                    }
                    articleCommentsVOList1.add(articleCommentsVO1);
                    if (data1!=null){
                        articleCommentsVOList1.add(articleCommentsVO1);
                    }

                }

                articleCommentsVO.setArticleCommentsVOList(articleCommentsVOList1);