Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-16 ff37f2fed3c479e5c664e5bff0834e37f400eceb

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

@@ -143,8 +143,8 @@
            index++;
        }
        ComActDO comActDO = comActDAO.selectById(communityId);
        if(comActDO.getStreetId()==null){
            return R.fail("请绑定街道，再操作！"+comActDO.toString());
        if(comActDO.getStreetId()==null||comActDO.getStreetId().toString().equals("")){
            return R.fail("请绑定街道，再操作！");
        }
        ArrayList<ComMngVillageDO> comMngVillageDOS = Lists.newArrayList();
        list.forEach(vo -> {