From e4607ebd52911ce5a4478c2987b679203eab9e76 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Mar 2023 14:24:56 +0800
Subject: [PATCH] dataSyncRecordDisability/detail/

---
 .../DataSyncRecordDisabilityServiceImpl.java  | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

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 9e0d232607..09e25a7e30 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
@@ -107,24 +107,22 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         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());
-        if (null == icResiUserDTO) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "ic_resi_user为空,icResiUserId:" + entity.getIcResiUserId(),
-                    String.format("居民信息中不存在此居民【icResiUserId：%s】", entity.getIcResiUserId()));
-        }
-        ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
-        if (StringUtils.isNotBlank(resiInfoDTO.getGender())) {
-            resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
-        } else {
-            resiInfoDTO.setGenderCn(GenderEnum.UN_KNOWN.getName());
+        if (StringUtils.isNotBlank(entity.getIcResiUserId())) {
+            IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
+            if (null != icResiUserDTO) {
+                ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
+                if (StringUtils.isNotBlank(resiInfoDTO.getGender())) {
+                    resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
+                } else {
+                    resiInfoDTO.setGenderCn(GenderEnum.UN_KNOWN.getName());
+                }
+                resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
+                resiInfoDTO.setCjlbCn(getCjlb(resiInfoDTO.getCjlb(), entity.getCustomerId()));
+                result.setResiInfo(resiInfoDTO);
+            } else {
+                log.warn(String.format("ic_resi_user is null icResiUserId:%s", entity.getIcResiUserId()));
+            }
         }
-        resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
-        resiInfoDTO.setCjlbCn(getCjlb(resiInfoDTO.getCjlb(),entity.getCustomerId()));
-        result.setResiInfo(resiInfoDTO);
         return result;
     }