Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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 # 不会创建新的网络

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>

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;