From fcb78d6023d3e7e81c943f9cc58201c4c0872deb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Aug 2020 13:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkActUserServiceImpl.java  | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index 1fa1472042..9523693d46 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -314,31 +314,36 @@ public class WorkActUserServiceImpl implements WorkActUserService {
     @Override
     public AuditingUserDetailResultDTO queryAuditingUserDetail(AactUserDetailFormDTO formDTO) {
         ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
+        if(null==actUserRelationDTO){
+            return null;
+        }
         UserBaseInfoResultDTO userBaseInfo=queryUserBaseInfo(actUserRelationDTO.getUserId());
         AuditingUserDetailResultDTO resultDTO=new AuditingUserDetailResultDTO();
         //基本信息赋值
         resultDTO.setActUserRelationId(actUserRelationDTO.getId());
         resultDTO.setActId(actUserRelationDTO.getActId());
         resultDTO.setUserId(actUserRelationDTO.getUserId());
-        if (StringUtils.isNotBlank(userBaseInfo.getRealName())) {
-            resultDTO.setRealName(userBaseInfo.getRealName());
-        } else {
-            resultDTO.setRealName(StrConstant.EPMETY_STR);
-        }
-        if (StringUtils.isNotBlank(userBaseInfo.getGender())) {
-            resultDTO.setGender(userBaseInfo.getGender());
-        } else {
-            resultDTO.setGender(StrConstant.EPMETY_STR);
-        }
-        if (StringUtils.isNotBlank(userBaseInfo.getMobile())) {
-            resultDTO.setMobile(userBaseInfo.getMobile());
-        } else {
-            resultDTO.setMobile(StrConstant.EPMETY_STR);
-        }
-        if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
-            resultDTO.setIdNum(userBaseInfo.getIdNum());
+        if(null!=userBaseInfo){
+            if (StringUtils.isNotBlank(userBaseInfo.getRealName())) {
+                resultDTO.setRealName(userBaseInfo.getRealName());
+            } else {
+                resultDTO.setRealName(StrConstant.EPMETY_STR);
+            }
+            if (StringUtils.isNotBlank(userBaseInfo.getGender())) {
+                resultDTO.setGender(userBaseInfo.getGender());
+            } else {
+                resultDTO.setGender(StrConstant.EPMETY_STR);
+            }
+            if (StringUtils.isNotBlank(userBaseInfo.getMobile())) {
+                resultDTO.setMobile(userBaseInfo.getMobile());
+            } else {
+                resultDTO.setMobile(StrConstant.EPMETY_STR);
+            }
+            if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
+                resultDTO.setIdNum(userBaseInfo.getIdNum());
+            }
+            resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
         }
-        resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
         resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
         /**
          * 当前状态（已报名/待审核auditing，
@@ -389,14 +394,16 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         UserBaseInfoResultDTO userBaseInfoResultDTO=this.queryUserBaseInfo(formDTO.getUserId());
         //基本信息
         resultDTO.setUserId(formDTO.getUserId());
-        if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){
-            resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
-        }
-        if(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname())){
-            resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
-        }
-        if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){
-            resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
+        if(null!=userBaseInfoResultDTO){
+            if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){
+                resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
+            }
+            if(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname())){
+                resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
+            }
+            if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){
+                resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
+            }
         }
         //参与活动统计值
         HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());