From 81c528e063e3be4b2df7b67a446117ba971dac12 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 五月 2022 10:12:58 +0800
Subject: [PATCH] bug修改

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index df919f7..4a46da5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -721,14 +721,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -736,7 +736,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -751,7 +751,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1042,14 +1042,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1057,7 +1057,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -1072,7 +1072,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1370,14 +1370,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1385,7 +1385,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -1400,7 +1400,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1698,14 +1698,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1713,7 +1713,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -1728,7 +1728,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2026,14 +2026,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2041,7 +2041,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -2056,7 +2056,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2355,14 +2355,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2370,7 +2370,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -2385,7 +2385,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2684,14 +2684,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2699,7 +2699,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -2714,7 +2714,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3011,14 +3011,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3026,7 +3026,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -3041,7 +3041,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3338,14 +3338,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3353,7 +3353,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -3368,7 +3368,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3665,14 +3665,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3680,7 +3680,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -3695,7 +3695,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3997,14 +3997,14 @@
             Integer nub = 1;
 
             // 查询所有人口数据放入HashMap中
-            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
             HashMap<String, Object> populationMap = new HashMap<>();
             populationList.forEach(population -> {
                 String key = population.getCardNo();
                 populationMap.put(key, population);
             });
             // 查询所有房屋信息放入到HashMap中
-            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
             HashMap<String, Object> houseMap = new HashMap<>();
             houseLists.forEach(house -> {
                 String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -4012,7 +4012,7 @@
                 houseMap.put(key, house);
             });
 
-            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
             HashMap<String, Object> villageMap = new HashMap<>();
             villageList.forEach(village -> {
                 String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
@@ -4027,7 +4027,7 @@
             });
 
             List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
-                comMngPopulationCommunityTagsDAO.selectList(null);
+                comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityName,communityId));
             HashMap<String, Object> populationCommunityMap = new HashMap<>();
             populationCommunityLists.forEach(populationCommunity -> {
                 String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";

--
Gitblit v1.7.1