#feat ,,

yanghui

2022-12-08 1ecd31f8402e498f64504ba41641a672c8dd7276

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1267,8 +1267,14 @@
            memberPage.setRecordsCount(partyMemberAnalysisVOS.size());
            memberPage.setPages(getPages(memberPage.getRecordsCount(), size));
            //处理分页的结果
            unitPage.setRecords(subUnitList((ArrayList) unitActivityAnalysisVOS, page,size));
            memberPage.setRecords(subUnitList((ArrayList)partyMemberAnalysisVOS,page ,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));

        }else {
            unitPage.setRecords(unitActivityAnalysisVOS);