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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java

@@ -94,7 +94,7 @@

    @GetMapping("/areaTownCommunity")
    public R test(@RequestParam("name")String name,@RequestParam("userId")Long userId){
        Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L};
        Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L,89234L};
        if("panzhihua".equals(name)){
            List<ComAreaCounty> list=comAreaTownCommunityDao.selectArea();
            list.forEach(lis->{
@@ -107,6 +107,11 @@
                    else {
                        list1=comAreaTownCommunityDao.selectCommunity(tow.getValue(),"");
                    }
                    if("大渡口街道".equals(tow.getValue())){
                        ComAreaCounty comAreaCounty=list1.get(0);
                        list1.remove(0);
                        list1.add(2,comAreaCounty);
                    }
                    tow.setChildren(list1);
                });
                lis.setChildren(townList);