From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 07394b6..5ff7167 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
@@ -58,7 +58,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入publicDiscuss")
public R<PublicDiscussEntity> detail(PublicDiscussVO publicDiscuss) {
- publicDiscuss.setUserId(AuthUtil.getUserId());
+// publicDiscuss.setUserId(AuthUtil.getUserId());
PublicDiscussEntity detail = publicDiscussService.getDetail(publicDiscuss);
return R.data(detail);
}
@@ -113,10 +113,7 @@
@ApiOperation(value = "新增或修改", notes = "传入publicDiscuss")
public R submit(@Valid @RequestBody PublicDiscussEntity publicDiscuss) {
publicDiscuss.setCreateBy(AuthUtil.getUserId());
- UpdateWrapper<PublicDiscussEntity> objectUpdateWrapper = new UpdateWrapper<>();
- objectUpdateWrapper.eq("article_id", publicDiscuss.getArticleId());
- objectUpdateWrapper.eq("event_type", publicDiscuss.getEventType());
- return R.status(publicDiscussService.saveOrUpdate(publicDiscuss,objectUpdateWrapper));
+ return R.status(publicDiscussService.saveOrUpdate(publicDiscuss));
}
/**
--
Gitblit v1.9.3