From 12d3e600943c8d06ed6d04c7f6af234b1ab590c7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 22 Sep 2022 12:27:46 +0800
Subject: [PATCH] =?UTF-8?q?sendNoticeV2=E5=8A=A0=E4=B8=AA=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9C=8B=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
index 710dd05ee9..cc68cb43de 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNoticeServiceImpl.java
@@ -7,6 +7,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.ChannelEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -375,10 +377,16 @@ public class IcNoticeServiceImpl extends BaseServiceImpl<IcNoticeDao, IcNoticeEn
             // 身份证号手机号
             if (NumConstant.ZERO_STR.equals(formDTO.getOrigin())) {
                 IcTripReportRecordEntity icTripReportRecordEntity = icTripReportRecordDao.selectById(bdId);
+                if(null==icTripReportRecordEntity){
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "ic_trip_report_record不存在id=" + bdId + "的记录", "获取身份证手机号为空");
+                }
                 entity.setMobile(icTripReportRecordEntity.getMobile());
                 entity.setIdCard(icTripReportRecordEntity.getIdCard());
             } else if (NumConstant.ONE_STR.equals(formDTO.getOrigin()) || NumConstant.TWO_STR.equals(formDTO.getOrigin())) {
                 IcEpidemicSpecialAttentionEntity icEpidemicSpecialAttentionEntity = icEpidemicSpecialAttentionDao.selectById(bdId);
+                if (null == icEpidemicSpecialAttentionEntity) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "ic_epidemic_special_attention不存在id=" + bdId + "的记录", "获取身份证手机号为空");
+                }
                 entity.setMobile(icEpidemicSpecialAttentionEntity.getMobile());
                 entity.setIdCard(icEpidemicSpecialAttentionEntity.getIdCard());
             }