rentaiming
2024-07-26 8d738d847973e1184a704b5ca3d4f492bffdb03f
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -101,7 +101,7 @@
        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{
@@ -111,6 +111,7 @@
            }
        }
        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();
@@ -119,12 +120,19 @@
            memberArticleCollectionVO.setContent(byId.getContent());
            memberArticleCollectionVO.setImages(byId.getImages());
            memberArticleCollectionVO.setTitle(byId.getTitle());
            memberArticleCollectionVO.setCreateTime(byId.getCreateTime());
            memberArticleCollectionVO.setId(byId.getId());
            R<Member> membeOne = memberClient.getMembeOne(memberArticleCollectionVO.getMemberId(),
            R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(),
                    SecurityConstants.INNER);
            Member data = membeOne.getData();
            memberArticleCollectionVO.setMemberNickname(data.getNickname());
            memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            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);
        }