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 修复
---
/dev/null | 10 ----------
src/main/java/org/springblade/modules/discuss/controller/PublicDiscussController.java | 21 ++++++++++-----------
2 files changed, 10 insertions(+), 21 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);
}
+
/**
* 公益报名与议事 分页
*/
diff --git a/src/main/java/sql/checkinrecords.menu.sql b/src/main/java/sql/checkinrecords.menu.sql
deleted file mode 100644
index 2524bfa..0000000
--- a/src/main/java/sql/checkinrecords.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1731497074630852609', 1123598815738675201, 'checkInRecords', '打卡记录表', 'menu', '/checkInRecords/checkInRecords', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1731497074630852610', '1731497074630852609', 'checkInRecords_add', '新增', 'add', '/checkInRecords/checkInRecords/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1731497074630852611', '1731497074630852609', 'checkInRecords_edit', '修改', 'edit', '/checkInRecords/checkInRecords/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1731497074630852612', '1731497074630852609', 'checkInRecords_delete', '删除', 'delete', '/api/blade-checkInRecords/checkInRecords/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1731497074630852613', '1731497074630852609', 'checkInRecords_view', '查看', 'view', '/checkInRecords/checkInRecords/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/circle.menu.sql b/src/main/java/sql/circle.menu.sql
deleted file mode 100644
index 461e42a..0000000
--- a/src/main/java/sql/circle.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730120254748745729', 1123598815738675201, 'circle', '圈子表', 'menu', '/circle/circle', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730120254748745730', '1730120254748745729', 'circle_add', '新增', 'add', '/circle/circle/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730120254748745731', '1730120254748745729', 'circle_edit', '修改', 'edit', '/circle/circle/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730120254748745732', '1730120254748745729', 'circle_delete', '删除', 'delete', '/api/blade-circle/circle/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730120254748745733', '1730120254748745729', 'circle_view', '查看', 'view', '/circle/circle/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/circlecomment.menu.sql b/src/main/java/sql/circlecomment.menu.sql
deleted file mode 100644
index a229660..0000000
--- a/src/main/java/sql/circlecomment.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730479582710194177', 1123598815738675201, 'circle', '圈子评论表', 'menu', '/circle/circle', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730479582710194178', '1730479582710194177', 'circle_add', '新增', 'add', '/circle/circle/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730479582710194179', '1730479582710194177', 'circle_edit', '修改', 'edit', '/circle/circle/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730479582710194180', '1730479582710194177', 'circle_delete', '删除', 'delete', '/api/blade-circle/circle/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730479582710194181', '1730479582710194177', 'circle_view', '查看', 'view', '/circle/circle/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/circlelike.menu.sql b/src/main/java/sql/circlelike.menu.sql
deleted file mode 100644
index 4c0c193..0000000
--- a/src/main/java/sql/circlelike.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730146232548057090', 1123598815738675201, 'circle', '圈子点赞表', 'menu', '/circle/circle', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730146232548057091', '1730146232548057090', 'circle_add', '新增', 'add', '/circle/circle/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730146232548057092', '1730146232548057090', 'circle_edit', '修改', 'edit', '/circle/circle/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730146232548057093', '1730146232548057090', 'circle_delete', '删除', 'delete', '/api/blade-circle/circle/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1730146232548057094', '1730146232548057090', 'circle_view', '查看', 'view', '/circle/circle/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/conveniencehotline.menu.sql b/src/main/java/sql/conveniencehotline.menu.sql
deleted file mode 100644
index e86c113..0000000
--- a/src/main/java/sql/conveniencehotline.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1728983132062883841', 1123598815738675201, 'convenienceHotline', '热线表', 'menu', '/convenienceHotline/convenienceHotline', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1728983132062883842', '1728983132062883841', 'convenienceHotline_add', '新增', 'add', '/convenienceHotline/convenienceHotline/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1728983132062883843', '1728983132062883841', 'convenienceHotline_edit', '修改', 'edit', '/convenienceHotline/convenienceHotline/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1728983132062883844', '1728983132062883841', 'convenienceHotline_delete', '删除', 'delete', '/api/blade-convenienceHotline/convenienceHotline/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1728983132062883845', '1728983132062883841', 'convenienceHotline_view', '查看', 'view', '/convenienceHotline/convenienceHotline/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/publicdiscuss.menu.sql b/src/main/java/sql/publicdiscuss.menu.sql
deleted file mode 100644
index ddce3c0..0000000
--- a/src/main/java/sql/publicdiscuss.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727263229228367873', 1123598815738675201, 'publicDiscuss', '公益报名与议事', 'menu', '/discuss/publicDiscuss', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727263229228367874', '1727263229228367873', 'publicDiscuss_add', '新增', 'add', '/discuss/publicDiscuss/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727263229228367875', '1727263229228367873', 'publicDiscuss_edit', '修改', 'edit', '/discuss/publicDiscuss/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727263229228367876', '1727263229228367873', 'publicDiscuss_delete', '删除', 'delete', '/api/public_discuss/publicDiscuss/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727263229228367877', '1727263229228367873', 'publicDiscuss_view', '查看', 'view', '/discuss/publicDiscuss/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/topics.menu.sql b/src/main/java/sql/topics.menu.sql
deleted file mode 100644
index b37d448..0000000
--- a/src/main/java/sql/topics.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996484665345', 1123598815738675201, 'topics', '议题表', 'menu', '/discuss/topics', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996484665346', '1727261996484665345', 'topics_add', '新增', 'add', '/discuss/topics/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996484665347', '1727261996484665345', 'topics_edit', '修改', 'edit', '/discuss/topics/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996484665348', '1727261996484665345', 'topics_delete', '删除', 'delete', '/api/blade-topics/topics/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996484665349', '1727261996484665345', 'topics_view', '查看', 'view', '/discuss/topics/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/userpublicenroll.menu.sql b/src/main/java/sql/userpublicenroll.menu.sql
deleted file mode 100644
index 7cd76cc..0000000
--- a/src/main/java/sql/userpublicenroll.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996811821057', 1123598815738675201, 'userPublicEnroll', '用户公益报名记录表', 'menu', '/discuss/userPublicEnroll', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996811821058', '1727261996811821057', 'userPublicEnroll_add', '新增', 'add', '/discuss/userPublicEnroll/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996811821059', '1727261996811821057', 'userPublicEnroll_edit', '修改', 'edit', '/discuss/userPublicEnroll/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996811821060', '1727261996811821057', 'userPublicEnroll_delete', '删除', 'delete', '/api/blade-userPublicEnroll/userPublicEnroll/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261996811821061', '1727261996811821057', 'userPublicEnroll_view', '查看', 'view', '/discuss/userPublicEnroll/view', 'file-text', 4, 2, 2, 1, NULL, 0);
diff --git a/src/main/java/sql/usertopics.menu.sql b/src/main/java/sql/usertopics.menu.sql
deleted file mode 100644
index 82efc35..0000000
--- a/src/main/java/sql/usertopics.menu.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261997134782465', 1123598815738675201, 'userTopics', '用户议题报表', 'menu', '/discuss/userTopics', NULL, 1, 1, 0, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261997134782466', '1727261997134782465', 'userTopics_add', '新增', 'add', '/discuss/userTopics/add', 'plus', 1, 2, 1, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261997134782467', '1727261997134782465', 'userTopics_edit', '修改', 'edit', '/discuss/userTopics/edit', 'form', 2, 2, 2, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261997134782468', '1727261997134782465', 'userTopics_delete', '删除', 'delete', '/api/blade-userTopics/userTopics/remove', 'delete', 3, 2, 3, 1, NULL, 0);
-INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
-VALUES ('1727261997134782469', '1727261997134782465', 'userTopics_view', '查看', 'view', '/discuss/userTopics/view', 'file-text', 4, 2, 2, 1, NULL, 0);
--
Gitblit v1.9.3