From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
index 0fbfd1f..5f7d84a 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
+++ b/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);
 
         }

--
Gitblit v1.7.1