From 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Dec 2023 20:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
index 293fe29..def2aa5 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
@@ -59,8 +59,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入publicDiscuss")
- public R<PublicDiscussVO> detail(PublicDiscussEntity publicDiscuss) {
- PublicDiscussEntity detail = publicDiscussService.getOne(Condition.getQueryWrapper(publicDiscuss));
+ public R<PublicDiscussVO> detail(PublicDiscussVO publicDiscuss) {
+ publicDiscuss.setUserId(AuthUtil.getUserId());
+ PublicDiscussEntity detail = publicDiscussService.getDetail(publicDiscuss);
return R.data(PublicDiscussWrapper.build().entityVO(detail));
}
/**
--
Gitblit v1.9.3