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()); ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -1,32 +1,26 @@ package com.ruoyi.article.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.article.domain.Article; import com.ruoyi.article.domain.ArticleComments; import com.ruoyi.article.domain.MemberArticleCollection; import com.ruoyi.article.domain.MemberLike; import com.ruoyi.article.dto.ArticleDTO; import com.ruoyi.article.dto.MemberArticleCollectionDTO; import com.ruoyi.article.mapper.MemberArticleCollectionMapper; import com.ruoyi.article.service.IArticleService; import com.ruoyi.article.service.IMemberArticleCollectionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.article.vo.ArticleCommentsVO; import com.ruoyi.article.vo.ArticleVO; import com.ruoyi.article.vo.MemberArticleCollectionVO; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.feignClient.MemberClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; /** * <p> @@ -101,7 +95,8 @@ memberArticleCollectionVO.setImages(byId.getImages()); memberArticleCollectionVO.setTitle(byId.getTitle()); R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId()); R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(), SecurityConstants.INNER); Member data = membeOne.getData(); memberArticleCollectionVO.setMemberNickname(data.getNickname()); memberArticleCollectionVO.setIsCollect(1);
