From a97c34cbbb27b7600e9ff89a1d3d14482bd34134 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 六月 2022 15:59:02 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 3e10cf6..565b693 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
@@ -79,17 +79,20 @@
 
     @Override
     public R listComActVillage(ComMngVillageVO comMngVillageVO) {
-        List<ComMngVillageDO> vos = Lists.newArrayList();
-        LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
-        if(StringUtils.isNotEmpty(comMngVillageVO.getName())){
-            param.like(ComMngVillageDO::getName, comMngVillageVO.getName());
+        if(comMngVillageVO.getCommunityId()!=null){
+            List<ComMngVillageDO> vos = Lists.newArrayList();
+            LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
+            if(StringUtils.isNotEmpty(comMngVillageVO.getName())){
+                param.like(ComMngVillageDO::getName, comMngVillageVO.getName());
+            }
+            if(comMngVillageVO.getCommunityId()!=0){
+                param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
+            }
+            List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
+            BeanUtils.copyProperties(comMngVillageDOS, vos);
+            return R.ok(comMngVillageDOS);
         }
-        if(comMngVillageVO.getCommunityId()!=0){
-            param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
-        }
-        List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
-        BeanUtils.copyProperties(comMngVillageDOS, vos);
-        return R.ok(comMngVillageDOS);
+        return R.fail("暂无小区数据");
     }
 
     @Override

--
Gitblit v1.7.1