修改bug

rentaiming

2024-07-26 8d738d847973e1184a704b5ca3d4f492bffdb03f

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

@@ -22,6 +22,8 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListPageDTO;
import com.ruoyi.system.api.feignClient.MemberClient;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -88,9 +90,9 @@
    @Override
    public PageDTO<MemberArticleCollectionVO> getMemberArticleCollection(ArticleDTO articleDTO) {
        Set<Long> goodsSkuIdList = null;
        if (StringUtils.isNotEmpty(articleDTO.getTitle())) {
        if (StringUtils.isNotEmpty(articleDTO.getGoodsSkuName())) {
            LambdaQueryWrapper<Article> wrapper= Wrappers.lambdaQuery();
            wrapper.like(Article::getTitle,articleDTO.getTitle());
            wrapper.like(Article::getTitle,articleDTO.getGoodsSkuName());
            wrapper.eq(Article::getDelFlag,0);
            List<Article> page1 = articleMapper.selectList(wrapper);
            goodsSkuIdList = page1.stream().map(Article::getId)
@@ -99,12 +101,17 @@
        Page<MemberArticleCollection> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
        LambdaQueryWrapper<MemberArticleCollection> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberArticleCollection::getMemberId,articleDTO.getMemberId());
        if (StringUtils.isNotEmpty(articleDTO.getTitle())){
        if (StringUtils.isNotEmpty(articleDTO.getGoodsSkuName())){
            if (goodsSkuIdList.size()>0){
                wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList);
            }else{
                Set<Long> goodsSkuIdList1 = new HashSet<>();
                goodsSkuIdList1.add(0L);
                wrapper.in(MemberArticleCollection::getTargetId,goodsSkuIdList1);
            }
        }
        wrapper.eq(MemberArticleCollection::getDelFlag,0);
        wrapper.orderByDesc(MemberArticleCollection::getCreateTime);
        Page<MemberArticleCollection> page1 = this.page(page, wrapper);
        PageDTO<MemberArticleCollectionVO> articleCommentsVOPageDTO = PageDTO.of(page1, MemberArticleCollectionVO.class);
        List<MemberArticleCollectionVO> list2 = articleCommentsVOPageDTO.getList();
@@ -113,13 +120,20 @@
            memberArticleCollectionVO.setContent(byId.getContent());
            memberArticleCollectionVO.setImages(byId.getImages());
            memberArticleCollectionVO.setTitle(byId.getTitle());

            R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(),
            memberArticleCollectionVO.setCreateTime(byId.getCreateTime());
            memberArticleCollectionVO.setId(byId.getId());
            R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            memberArticleCollectionVO.setMemberNickname(data.getNickname());
            memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            memberArticleCollectionVO.setIsCollect(1);
            if (data!=null){
                memberArticleCollectionVO.setMemberNickname(data.getNickname());
                memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            }else{
                memberArticleCollectionVO.setMemberNickname("平台发布");
                memberArticleCollectionVO.setMemberAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
            }

            memberArticleCollectionVO.setIsCollect(2);

        }
        return articleCommentsVOPageDTO;