缓存修改

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());