From 95163bc7f6714edcb14dd4369717b0a9d1ae15da Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 五月 2024 19:33:23 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 68bba48..bc8b1e9 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
@@ -14,7 +14,9 @@
import com.ruoyi.article.service.IArticleService;
import com.ruoyi.article.service.IMemberArticleCollectionService;
import com.ruoyi.article.service.IMemberLikeService;
+import com.ruoyi.article.service.IMemberLikeService;
import com.ruoyi.article.vo.ArticleCommentsVO;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
@@ -22,18 +24,15 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.feignClient.MemberClient;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import util.HuaWeiOBSUtil;
-
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import util.HuaWeiOBSUtil;
/**
* <p>
@@ -263,7 +262,8 @@
@Override
public void getReport(ArticleDTO articleDTO) {
Article article= articleService.getById(articleDTO.getId());
- R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId());
+ R<Member> membeOne = memberClient.getMembeOne(articleDTO.getMemberId(),
+ SecurityConstants.INNER);
Member data = membeOne.getData();
article.setReportBy(data.getNickname());
article.setReportedTime(LocalDateTime.now());
--
Gitblit v1.7.1