From 5155f7b38f712a277f7a99201482fde6179809f8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 2 Apr 2022 09:29:25 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/house/housedel=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8/gov/org/house/delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 36ace6672d..6a07ba0ea2 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
@@ -150,8 +150,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delHouse(String houseId) {
-        //删除小区
-        icHouseService.deleteById(houseId);
+        //单个删除房屋，房屋内有居民不允许删除
+        NeighborHoodManageDelFormDTO formDTO=new NeighborHoodManageDelFormDTO();
+        formDTO.setType(CustomerGridConstant.HOUSE);
+        formDTO.setIds(Arrays.asList(houseId));
+        allDelete(formDTO);
     }
 
     @Override