From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java |    9 +++++++++
 1 files changed, 9 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..7c1ac3a 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 || comActDO.getStreetId() == null) {
+            return R.fail("社区没有绑定街道,请绑定后操作!");
+        }
         comMngVillageDO.setStreetId(comActDO.getStreetId());
         int insert = comActVillageDAO.insert(comMngVillageDO);
         if (insert > 0) {
@@ -94,6 +97,9 @@
         page.setSize(pageSize);
         page.setCurrent(pageNum);
         LambdaQueryWrapper<ComMngVillageDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
+        if(pageComMngVillageDTO.getCommunityId() != null){
+            userLambdaQueryWrapper.eq(ComMngVillageDO::getCommunityId,pageComMngVillageDTO.getCommunityId());
+        }
         if (pageComMngVillageDTO.getAlley() != null) {
             userLambdaQueryWrapper.like(ComMngVillageDO::getAlley, pageComMngVillageDTO.getAlley());
         }
@@ -140,6 +146,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