新冠病毒疫苗接种人员信息台账------审核前信息验证

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");