From 63aeeb9b7a26be88704c7c48102733554ab35e18 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 17:43:25 +0800
Subject: [PATCH] =?UTF-8?q?user=20=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml   | 2 +-
 epmet-user/epmet-user-server/pom.xml                         | 2 +-
 .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 3c0801797b..212fd27bf0 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.107
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.108
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 173587ae25..c914d5b088 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.107</version>
+    <version>0.3.108</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index 5da4155b92..bfb4ff6110 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -155,6 +155,9 @@ public class UserBaseInfoRedis {
                 List<UserWechatEntity> wechatInfo = userWechatDao.selectByUserId(userId);
                 if(null != wechatInfo && !wechatInfo.isEmpty()){
                     baseInfo.setNickname(wechatInfo.get(NumConstant.ZERO).getNickname());
+                    if(StringUtils.isBlank(baseInfo.getNickname())){
+                        baseInfo.setNickname(ModuleConstant.EMPTY_STR);
+                    }
                 }else{
                     return null;
                 }
@@ -170,6 +173,8 @@ public class UserBaseInfoRedis {
                 }
             }
 
+            return baseInfo;
+
         }
 
         return null;