From 4ee98e4b697142960b015f22e2e97e4372ee7487 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 7 Aug 2020 17:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserServiceImpl.java    | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

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 f90ef05032..0a0c95d6fc 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
@@ -139,18 +139,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserBaseInfoEntity baseInfo = new UserBaseInfoEntity();
         UserBaseInfoResultDTO cache = userBaseInfoRedis.get(wxUserInfoFormDTO.getUserId());
-        if(null == cache || StringUtils.isBlank(cache.getId())){
-            //没有缓存
-            cache =
-                userBaseInfoDao.selectListByUserIdList(wxUserInfoFormDTO.getUserId());
-            if(null == cache || StringUtils.isBlank(cache.getId()) || StringUtils.isBlank(cache.getMobile()) ||StringUtils.isBlank(cache.getSurname())){
-                //没有baseInfo
-                UserResiInfoDTO resiInfo =
-                    userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId());
-                if(null == resiInfo || StringUtils.isBlank(resiInfo.getId())){
-                    //没有resiInfo
-                    return new Result();
-                }else{
+        UserResiInfoDTO resiInfo = userResiInfoDao.selectByUserId(wxUserInfoFormDTO.getUserId());
+        if(null != resiInfo && StringUtils.isNotBlank((resiInfo.getId()))) {
                     baseInfo.setSurname(resiInfo.getSurname());
                     baseInfo.setName(resiInfo.getName());
                     baseInfo.setStreet(resiInfo.getStreet());
@@ -158,8 +148,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                     baseInfo.setBuildingAddress(resiInfo.getBuildingAddress());
                     baseInfo.setMobile(resiInfo.getRegMobile());
                 }
-            }
-        }
+
+
 
         baseInfo.setUserId(wxUserInfoFormDTO.getUserId());
         baseInfo.setNickname(wxUserInfoFormDTO.getNickName());