From d54774f504891fc4a626bfa2783c422fbef62cdd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Mar 2023 09:56:57 +0800
Subject: [PATCH] 
 /epmetuser/dataSyncRecordDisability/detail/1585903730961670146

---
 .../service/impl/DataSyncRecordDisabilityServiceImpl.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
index 4ee1cdb64e..0dca160e1b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
@@ -97,11 +97,18 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
     @Override
     public DataSyncRecordDisabilityDTO get(String id) {
         DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
+        if (null == entity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "data_sync_record_disability记录不存在，id:" + id, "记录不存在");
+        }
         DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
         result.setGenderCn(GenderEnum.UN_KNOWN.getName());
         if (null != result.getGender()){
             result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
         }
+        if(StringUtils.isBlank(entity.getIcResiUserId())){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "icResiUserId为空,idCard:" + entity.getIdCard(),
+                    String.format("居民信息中不存在此居民【身份证号：%s】", entity.getIdCard()));
+        }
         IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
         ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
         resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");