yanghui
2022-12-08 08fe3c2056e05970d1ede1baa7663ab6957cf911
Merge branch 'local_20221104' into huacheng_test
1个文件已修改
10 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);