From 0bcbea2abca9ec6fac2a7b184680d31d7f60e3ae Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 10 Aug 2020 14:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E7=94=A8=E6=88=B7=E6=98=AF=E9=99=8C=E7=94=9F=E4=BA=BA?=
 =?UTF-8?q?=E5=88=99=E6=98=BE=E7=A4=BA=E9=99=8C=E7=94=9F=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java    | 2 +-
 .../src/main/java/com/epmet/service/impl/UserServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 84e196906f..7ed2a69c4f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -245,7 +245,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             userBaseInfoRedis.getUserInfo(userId);
         if(null != userInfo){
         CustomerUserDetailResultDTO result = ConvertUtils.sourceToTarget(userInfo,CustomerUserDetailResultDTO.class);
-        result.setName(userInfo.getRealName());
+        result.setName(StringUtils.isBlank(userInfo.getRealName()) ? userInfo.getNickname() : userInfo.getRealName());
         result.setGender(StringUtils.equals(NumConstant.ZERO_STR,userInfo.getGender()) || StringUtils.isBlank(userInfo.getGender()) ?
         ModuleConstant.GENDER_UNKNOWN : (StringUtils.equals(NumConstant.ONE_STR,userInfo.getGender()) ? ModuleConstant.GENDER_MALE : ModuleConstant.GENDER_FEMALE));
         result.setAddress(new StringBuilder(StringUtils.isBlank(userInfo.getDistrict()) ? ModuleConstant.EMPTY_STR : userInfo.getDistrict()).append(StringUtils.isBlank(userInfo.getStreet())? ModuleConstant.EMPTY_STR : userInfo.getStreet()).append(StringUtils.isBlank(userInfo.getBuildingAddress()) ? ModuleConstant.EMPTY_STR : userInfo.getBuildingAddress()).toString());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 0a0c95d6fc..0c2533944e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -138,7 +138,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         userWechatDao.updateByUserId(userWechatDTO);
 
         UserBaseInfoEntity baseInfo = new UserBaseInfoEntity();
-        UserBaseInfoResultDTO cache = userBaseInfoRedis.get(wxUserInfoFormDTO.getUserId());
+       //UserBaseInfoResultDTO cache = userBaseInfoRedis.get(wxUserInfoFormDTO.getUserId());
         UserResiInfoDTO resiInfo = userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId());
         if(null != resiInfo && StringUtils.isNotBlank((resiInfo.getId()))) {
                     baseInfo.setSurname(resiInfo.getSurname());