From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
index c78aeb9..1d646d9 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
@@ -21,8 +21,13 @@
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.mapper.PublicDiscussMapper;
import org.springblade.modules.discuss.service.IPublicDiscussService;
+import org.springblade.modules.discuss.service.IUserPublicEnrollService;
+import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* 公益报名与议事 服务实现类
@@ -35,8 +40,13 @@
@Override
public IPage<PublicDiscussVO> selectPublicDiscussPage(IPage<PublicDiscussVO> page, PublicDiscussVO publicDiscuss) {
- return page.setRecords(baseMapper.selectPublicDiscussPage(page, publicDiscuss));
+ List<PublicDiscussVO> publicDiscussVOS = baseMapper.selectPublicDiscussPage(page, publicDiscuss);
+ return page.setRecords(publicDiscussVOS);
}
+ @Override
+ public PublicDiscussVO getDetail(PublicDiscussVO publicDiscuss) {
+ return baseMapper.selectPublicDiscuss(publicDiscuss);
+ }
}
--
Gitblit v1.9.3