From 47854f531bd87b8f7f6cfeaba91e87cf497193ce Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期四, 08 十二月 2022 14:46:58 +0800 Subject: [PATCH] #feat 还原 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java index 68cf718..a940986 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java @@ -1267,14 +1267,8 @@ memberPage.setRecordsCount(partyMemberAnalysisVOS.size()); memberPage.setPages(getPages(memberPage.getRecordsCount(), size)); //处理分页的结果 - List<Object> a = new ArrayList<>(); - a.addAll(unitActivityAnalysisVOS); - a.addAll(unitActivityAnalysisVOS); - unitPage.setRecords(subUnitList((ArrayList) a, page,size)); - List<Object> b = new ArrayList<>(); - b.addAll(partyMemberAnalysisVOS); - b.addAll(partyMemberAnalysisVOS); - memberPage.setRecords(subUnitList((ArrayList)b,page ,size)); + unitPage.setRecords(subUnitList((ArrayList) unitActivityAnalysisVOS, page,size)); + memberPage.setRecords(subUnitList((ArrayList)partyMemberAnalysisVOS,page ,size)); }else { unitPage.setRecords(unitActivityAnalysisVOS); -- Gitblit v1.7.1