From b714023894362053bca15f5295e307049ee9216e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 15 四月 2021 18:27:56 +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 | 5 ++++-
1 files changed, 4 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..698ada9 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());
@@ -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();
--
Gitblit v1.7.1