From 8332d47ec34bb79c49b80ba38bdc4f50652c574f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 15 四月 2021 17:16:21 +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 |    3 +++
 1 files changed, 3 insertions(+), 0 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 0770984..bfc3826 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,6 +56,9 @@
         }
         BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
         ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
+        if(comActDO==null){
+            return R.fail("社区没有绑定街道,请绑定后操作!");
+        }
         comMngVillageDO.setStreetId(comActDO.getStreetId());
         int insert = comActVillageDAO.insert(comMngVillageDO);
         if (insert > 0) {

--
Gitblit v1.7.1