From 8aa1a5cf149a9b1fb792c437d5e74776ec2d3a23 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 24 Aug 2022 15:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?=
 =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6------=E5=AE=A1=E6=A0=B8=E5=89=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcHouseServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 385f90f60d..76df21476b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -343,7 +343,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         // 校验小区
         IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.getNeighborHoodInfoByName(formDTO);
-        if(StringUtils.isNotBlank(icNeighborHoodEntity.getId())){
+        if(icNeighborHoodEntity != null && StringUtils.isNotBlank(icNeighborHoodEntity.getId())){
             formDTO.setVillageId(icNeighborHoodEntity.getId());
             checkHomeInfoResultInfo.setVillageId(icNeighborHoodEntity.getId());
         }else{
@@ -354,7 +354,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         // 校验楼宇
         IcBuildingEntity icBuildingEntity = icBuildingDao.getBuildingInfoByName(formDTO);
-        if(StringUtils.isNotBlank(icBuildingEntity.getId())){
+        if(icBuildingEntity != null && StringUtils.isNotBlank(icBuildingEntity.getId())){
             formDTO.setBuildId(icBuildingEntity.getId());
             checkHomeInfoResultInfo.setBuildId(icBuildingEntity.getId());
         }else{
@@ -365,7 +365,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         // 校验单元
         IcBuildingUnitEntity icBuildingUnitEntity = buildingUnitDao.getbuildingUnitInfoByName(formDTO);
-        if(StringUtils.isNotBlank(icBuildingUnitEntity.getId())){
+        if(icBuildingUnitEntity != null && StringUtils.isNotBlank(icBuildingUnitEntity.getId())){
             formDTO.setUnitId(icBuildingUnitEntity.getId());
             checkHomeInfoResultInfo.setUnitId(icBuildingUnitEntity.getId());
         }else{
@@ -377,7 +377,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         // 校验房屋
         IcHouseEntity icHouseEntity = baseDao.getHouseInfoByName(formDTO);
         checkHomeInfoResultInfo.setCode("0");
-        if(StringUtils.isNotBlank(icHouseEntity.getId())){
+        if(icHouseEntity != null && StringUtils.isNotBlank(icHouseEntity.getId())){
             checkHomeInfoResultInfo.setHomeId(icHouseEntity.getId());
             checkHomeInfoResultInfo.setMsg("该房屋为已存在房屋");
             checkHomeInfoResultInfo.setIsAdd("0");