Merge remote-tracking branch 'origin/master'

CeDo

2021-04-15 b714023894362053bca15f5295e307049ee9216e

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

@@ -56,7 +56,7 @@
        }
        BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
        ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
        if(comActDO==null){
        if (comActDO == null || comActDO.getStreetId() == null) {
            return R.fail("社区没有绑定街道，请绑定后操作！");
        }
        comMngVillageDO.setStreetId(comActDO.getStreetId());
@@ -143,6 +143,9 @@
            index++;
        }
        ComActDO comActDO = comActDAO.selectById(communityId);
        if(comActDO.getStreetId()==null||comActDO.getStreetId().toString().equals("")){
            return R.fail("请绑定街道，再操作！");
        }
        ArrayList<ComMngVillageDO> comMngVillageDOS = Lists.newArrayList();
        list.forEach(vo -> {
            ComMngVillageDO comMngVillageDO = new ComMngVillageDO();