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());