From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index eaa871b..5f9b473 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -101,7 +101,7 @@
public R detailDynamic(Long id) {
ComActDynDO comActDynDO = this.getById(id);
- ComActDynTypeDO comActDynTypeDO=comActDynTypeMapper.selectById(id);
+ ComActDynTypeDO comActDynTypeDO=comActDynTypeMapper.selectById(comActDynDO.getType());
if (ObjectUtils.isEmpty(comActDynDO)) {
return R.fail("社区动态不存在");
@@ -190,7 +190,7 @@
*/
@Override
public R pageDynamicByAdmin(ComActDynVO comActDynVO) {
- Page page = new Page<>();
+
Long pageNum = comActDynVO.getPageNum();
Long pageSize = comActDynVO.getPageSize();
if (null == pageNum || 0 == pageNum) {
@@ -199,8 +199,7 @@
if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
- page.setSize(pageSize);
- page.setCurrent(pageNum);
+ Page page = new Page<ComActDynVO>(pageNum,pageSize);
IPage<ComActDynVO> iPage = comActDynDAO.pageDynamicByAdmin(page, comActDynVO);
List<ComActDynVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
--
Gitblit v1.7.1