diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
index c4bbdf7..13b9bcb 100644
--- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
+++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
@@ -204,7 +204,7 @@ public class TokenService {
     private Long getTokenTime(){
         long tokenTime = 20L;
         String redisResult = redisService.getCacheObject("sys_config:"+ "sys.visit.tokentime");
-        if(!redisResult.isEmpty()) {
+        if(redisResult != null && !redisResult.isEmpty()) {
             tokenTime = Long.parseLong(redisResult);
         }else {
             Long result = systemConfig.getTokenTime();
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index d9bc633..10d2440 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -158,7 +158,14 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public SysUser selectUserByUserName(String userName) {
-        return userMapper.selectUserByUserName(userName);
+        SysUser sysUser = userMapper.selectUserByUserName(userName);
+        if (sysUser != null && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
+            //如果手机号长度超过11位，则需要进行解密
+            if (sysUser.getPhonenumber().length() > 11) {
+                sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
+            }
+        }
+        return sysUser;
     }
 
     /**
@@ -191,7 +198,14 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public SysUser selectUserById(Long userId) {
-        return userMapper.selectUserById(userId);
+        SysUser sysUser = userMapper.selectUserById(userId);
+        if (sysUser != null && StringUtils.isNotBlank(sysUser.getPhonenumber())) {
+            //如果手机号长度超过11位，则需要进行解密
+            if (sysUser.getPhonenumber().length() > 11) {
+                sysUser.setPhonenumber(Sm4Utils.decrypt(sysUser.getPhonenumber()));
+            }
+        }
+        return sysUser;
     }
 
     /**