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

张天森

2022-07-18 82e77c9148f1662d52360ac89e516ced0b3adb05

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java

@@ -109,6 +109,9 @@
        if (sub.equals(Constants.VILLAGE)){
            type=2;
        }
        if (loginUserInfoVO.getAccount().equals("fangyipingtai")){
            type=3;
        }
        return userService.communityList(type);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3617,8 +3617,10 @@
                StreetVO vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), type);
                vo.setCommunityList(communityVOS);
                if (communityVOS==null || communityVOS.size()==0){
                    iterator.remove();
                if (type!=3){
                    if (communityVOS==null || communityVOS.size()==0){
                        iterator.remove();
                    }
                }
            }
            List<StreetVOS> list=new ArrayList<>();