From f88910257158cd11cb880a3be3608392cb6b62fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 15:11:12 +0800
Subject: [PATCH] 查询详情 bug 修复
---
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 def2aa5..07394b6 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java
@@ -17,27 +17,25 @@
package org.springblade.modules.discuss.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.article.entity.ArticleLikeEntity;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
+import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
import org.springblade.modules.discuss.wrapper.PublicDiscussWrapper;
-import org.springblade.modules.discuss.service.IPublicDiscussService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* 公益报名与议事 控制器
@@ -59,11 +57,12 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入publicDiscuss")
- public R<PublicDiscussVO> detail(PublicDiscussVO publicDiscuss) {
+ public R<PublicDiscussEntity> detail(PublicDiscussVO publicDiscuss) {
publicDiscuss.setUserId(AuthUtil.getUserId());
PublicDiscussEntity detail = publicDiscussService.getDetail(publicDiscuss);
- return R.data(PublicDiscussWrapper.build().entityVO(detail));
+ return R.data(detail);
}
+
/**
* 公益报名与议事 分页
*/
--
Gitblit v1.9.3