Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -8,10 +8,8 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +28,7 @@ import java.util.List;
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
+
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
      */
@@ -151,11 +150,16 @@ public class BaseController {
         return StringUtils.format("redirect:{}", url);
     }
 
+
     /**
      * 获取用户缓存信息
      */
     public LoginUser getLoginUser() {
-        return SecurityUtils.getLoginUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SM4Util sm4Util = SpringUtils.getBean(SM4Util.class);
+        loginUser.getUser().setPhonenumber(sm4Util.decrypt(loginUser.getUser().getPhonenumber()));
+        loginUser.getUser().setEmail(sm4Util.decrypt(loginUser.getUser().getEmail()));
+        return loginUser;
     }
 
     /**