人员详情接口修改

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -314,12 +314,16 @@ 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(null!=userBaseInfo){
             if (StringUtils.isNotBlank(userBaseInfo.getRealName())) {
                 resultDTO.setRealName(userBaseInfo.getRealName());
             } else {
@@ -339,6 +343,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
                 resultDTO.setIdNum(userBaseInfo.getIdNum());
             }
             resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
+        }
         resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
         /**
          * 当前状态（已报名/待审核auditing，
@@ -389,6 +394,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         UserBaseInfoResultDTO userBaseInfoResultDTO=this.queryUserBaseInfo(formDTO.getUserId());
         //基本信息
         resultDTO.setUserId(formDTO.getUserId());
+        if(null!=userBaseInfoResultDTO){
             if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){
                 resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
             }
@@ -398,6 +404,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){
                 resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
             }
+        }
         //参与活动统计值
         HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());