Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-15 5ac466c6a9cdcfde5c8e0acdd29713f8ac8a8f5f

Merge remote-tracking branch 'origin/master'

 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());