解决冲突

mitao

2024-05-28 3b6e6d6dc6a6743a6b4ca7701dcb2ae1e6e7a26e

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

@@ -14,10 +14,9 @@
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
@@ -77,7 +76,8 @@
        List<ArticleVO> list2 = articleCommentsVOPageDTO.getList();
        for (ArticleVO articleVO:list2) {
            if (articleVO.getMemberId()!=null){
                R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId());
                R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data = membeOne.getData();
                articleVO.setMemberNickname(data.getNickname());
            }
@@ -193,7 +193,8 @@
        PageDTO<ArticleCommentsVO> articleCommentsVOPageDTO = PageDTO.of(page1, ArticleCommentsVO.class);
        List<ArticleCommentsVO> list2 = articleCommentsVOPageDTO.getList();
        for(ArticleCommentsVO articleCommentsVO:list2){
            R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId());
            R<Member> membeOne = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            articleCommentsVO.setMemberNickname(data.getNickname());
            articleCommentsVO.setBmemberNickavatar(data.getAvatar());
@@ -220,10 +221,12 @@
            for (ArticleComments articleComments1:list1){
                ArticleCommentsVO articleCommentsVO1=new ArticleCommentsVO();

                R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId());
                R<Member> membeOne1 = memberClient.getMembeOne(articleCommentsVO.getMemberId(),
                        SecurityConstants.INNER);
                Member data1 = membeOne1.getData();

                R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId());
                R<Member> membeOne2 = memberClient.getMembeOne(articleCommentsVO.getBmemberId(),
                        SecurityConstants.INNER);
                Member data2 = membeOne2.getData();

                articleCommentsVO1.setArticleId(articleComments1.getArticleId());