From 5ac466c6a9cdcfde5c8e0acdd29713f8ac8a8f5f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 15 四月 2021 18:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index bfc3826..80632e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/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());

--
Gitblit v1.7.1