From d20cf2979502fd58c999d2dc7df12e554a31d3df Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 24 七月 2024 11:07:54 +0800
Subject: [PATCH] 花城 排行范围选择本单位,呈现出了该账号单位以外的其它单位信息   党员活动的时长计算有问题。

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
index 4ca1282..a0b1b63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
@@ -16,6 +16,7 @@
 import javax.annotation.Resource;
 
 import java.util.Date;
+import java.util.List;
 
 import static java.util.Objects.isNull;
 
@@ -31,7 +32,8 @@
      * */
     @Override
     public R pageProceedings(Integer page, Integer size, String keyWord) {
-        return R.ok(CopyUtil.beanCopyList(comActProceedingsDao.pageProceedings(new Page(page,size),keyWord), ComActProceedingsVO.class));
+        List<ComActProceedingsVO> comActProceedingsVOS = comActProceedingsDao.pageProceedings(new Page(page, size), keyWord);
+        return R.ok(comActProceedingsVOS);
     }
 
     /**

--
Gitblit v1.7.1