From 49cde60fb04609c68026da7547930f7fa8d7976d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 2 Mar 2022 13:30:46 +0800
Subject: [PATCH] del

---
 .../com/epmet/service/impl/HouseServiceImpl.java     | 12 +++++++++---
 .../src/main/resources/mapper/IcHouseDao.xml         |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 3c9269c53d..f0923f1129 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -361,7 +361,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                     }
                 });
             }
-            icNeighborHoodDao.deleteBatchIds(ids);
+            if (!CollectionUtils.isEmpty(ids)){
+                icNeighborHoodDao.deleteBatchIds(ids);
+            }
             if (!CollectionUtils.isEmpty(exists)){
                 String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining("、"));
                 EpmetErrorCode.NEIGHBORHOOD_DEL_FAILED.setMsg(String.format(EpmetErrorCode.NEIGHBORHOOD_DEL_FAILED.getMsg(),collect));
@@ -379,7 +381,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                     }
                 });
             }
-            icBuildingDao.deleteBatchIds(ids);
+            if (!CollectionUtils.isEmpty(ids)){
+                icBuildingDao.deleteBatchIds(ids);
+            }
             if (!CollectionUtils.isEmpty(exists)){
                 String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining("、"));
                 EpmetErrorCode.BUILDING_DEL_FAILED.setMsg(String.format(EpmetErrorCode.BUILDING_DEL_FAILED.getMsg(),collect));
@@ -401,7 +405,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                     }
                 });
             }
-            icHouseDao.deleteBatchIds(ids);
+            if (!CollectionUtils.isEmpty(ids)){
+                icHouseDao.deleteBatchIds(ids);
+            }
             if (!CollectionUtils.isEmpty(exists)){
                 List<String> list = icHouseDao.selectHouseNames(exists);
                 String collect = list.stream().collect(Collectors.joining("、"));
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 9647aa4a70..40984e17f1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -343,7 +343,7 @@
                   #{id}
               </foreach>
             )
-        GROUP BY id
+        GROUP BY nh.id
     </select>
 
     <!-- 根据楼栋IDs查询楼栋下是否有存在房屋的 -->
@@ -359,7 +359,7 @@
                   #{id}
               </foreach>
             )
-        GROUP BY id
+        GROUP BY b.id
     </select>
 
     <!-- 根据房屋ID查询名字 -->