Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

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

@@ -225,8 +225,8 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityLists() {
        return R.ok(this.comActDAO.getCommunityLists());
    public R getCommunityLists(String appId) {
        return R.ok(this.comActDAO.getCommunityLists(appId));
    }

    @Override
@@ -252,8 +252,8 @@
                street.setCount(communityList.size());
            }
        });
//        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
//            .collect(Collectors.toList());
        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
            .collect(Collectors.toList());
        return R.ok(streetList);
    }

@@ -292,4 +292,7 @@
        return R.ok(comActPasswordVo);
    }

    public R selectIds(Long id){
        return R.ok(this.comActDAO.selectIds(id));
    }
}