From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index bad8f77..2f1c6ed 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -1,7 +1,7 @@
package com.ruoyi.common.core.controller;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -70,28 +70,28 @@
/**
* 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
*/
- public LoginUser getLoginUser() {
- return SecurityUtils.getLoginUser();
+ public SysUser getUser() {
+ return SecurityUtils.getUser();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛id
*/
public Long getUserId() {
- return getLoginUser().getUserId();
+ return SecurityUtils.getUserId();
}
/**
* 鑾峰彇鐧诲綍閮ㄩ棬id
*/
public Long getDeptId() {
- return getLoginUser().getDeptId();
+ return SecurityUtils.getDeptId();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
public String getUsername() {
- return getLoginUser().getUsername();
+ return SecurityUtils.getUsername();
}
}
--
Gitblit v1.9.3