Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -154,8 +154,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