修改bug

rentaiming

2024-07-10 b29becf95484be48aa09e87fcc7cc19f94cf9c81

 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)
@@ -102,6 +104,10 @@
        if (StringUtils.isNotEmpty(articleDTO.getTitle())){
            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);
@@ -113,13 +119,13 @@
            memberArticleCollectionVO.setContent(byId.getContent());
            memberArticleCollectionVO.setImages(byId.getImages());
            memberArticleCollectionVO.setTitle(byId.getTitle());

            memberArticleCollectionVO.setId(byId.getId());
            R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            memberArticleCollectionVO.setMemberNickname(data.getNickname());
            memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            memberArticleCollectionVO.setIsCollect(1);
            memberArticleCollectionVO.setIsCollect(2);

        }
        return articleCommentsVOPageDTO;