From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 11 六月 2024 18:18:05 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
index 0c82005..6f75caa 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java
@@ -64,7 +64,9 @@
if (articleDTO.getArticleType()!=0){
wrapper.eq(Article::getArticleType,articleDTO.getArticleType());
}
- wrapper.like(Article::getTitle,articleDTO.getTitle());
+ if (articleDTO.getTitle()!=null){
+ wrapper.like(Article::getTitle,articleDTO.getTitle());
+ }
wrapper.eq(Article::getStatus,2);
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
@@ -78,6 +80,7 @@
SecurityConstants.INNER);
Member data = membeOne.getData();
articleVO.setMemberNickname(data.getNickname());
+ articleVO.setMemberAvatar(data.getAvatar());
}
LambdaQueryWrapper<MemberLike> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(MemberLike::getMemberId, articleDTO.getMemberId());
@@ -110,6 +113,7 @@
Page<Article> page = new Page<>(articleDTO.getPageCurr(), articleDTO.getPageSize());
LambdaQueryWrapper< Article> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Article::getMemberId,articleDTO.getMemberId());
+ wrapper.eq(Article::getArticleType,2);
wrapper.eq( Article::getDelFlag,0);
wrapper.orderByDesc(Article::getCreateTime);
Page<Article> page1 = this.page(page, wrapper);
@@ -142,8 +146,15 @@
public ArticleVO getMemberArticleInfo(ArticleDTO articleDTO) {
Article article=this.getById(articleDTO.getId());
ArticleVO articleVO=new ArticleVO();
+
BeanUtils.copyProperties(article, articleVO);
+ R<Member> membeOne = memberClient.getMembeOne(articleVO.getMemberId(),
+ SecurityConstants.INNER);
+ Member data = membeOne.getData();
+ articleVO.setMemberNickname(data.getNickname());
+ articleVO.setMemberAvatar(data.getAvatar());
+
LambdaQueryWrapper<MemberLike> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(MemberLike::getMemberId,articleDTO.getMemberId());
wrapper1.eq(MemberLike::getArticleId,article.getId());
--
Gitblit v1.7.1