Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java

@@ -356,8 +356,11 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
             throw new RenException(myInfoResult.getCode(), myInfoResult.getMsg());
         }
         MyPointRankResultDTO result = new MyPointRankResultDTO();
-        result.setHeadPhoto(myInfoResult.getData().get(0).getHeadImgUrl());
-        result.setUserName(myInfoResult.getData().get(0).getRealName());
+        String headImgUrl = myInfoResult.getData().get(0).getHeadImgUrl();
+        result.setHeadPhoto(StringUtils.isBlank(headImgUrl)? StrConstant.EPMETY_STR:headImgUrl);
+        String realName = myInfoResult.getData().get(0).getRealName();
+        String nickName = myInfoResult.getData().get(0).getNickname();
+        result.setUserName(StringUtils.isBlank(realName)? (StringUtils.isBlank(nickName)?"我":nickName) :realName);
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getUserPointList(tokenDto.getCustomerId(), null, null);
         result.setCustomerRank(getRank(list, tokenDto.getUserId()));