!475 LoginHelper类 login方法存在重复代码

Merge pull request !475 from simple/loginhelper
2 years ago · a7bb4ee50c
parent 63374ee876 339f85741f
commit a7bb4ee50c
1 changed files with 1 additions and 2 deletions
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@ -49,10 +49,9 @@ public class LoginHelper {
        StpUtil.login(loginUser.getLoginId(),
            model.setExtra(TENANT_KEY, loginUser.getTenantId())
                .setExtra(USER_KEY, loginUser.getUserId())
+                .setExtra(USER_NAME_KEY, loginUser.getUsername())
                .setExtra(DEPT_KEY, loginUser.getDeptId())
-                .setExtra(TENANT_KEY, loginUser.getTenantId())
                .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
-                .setExtra(USER_NAME_KEY, loginUser.getUsername())
        );
        SaSession tokenSession = StpUtil.getTokenSession();
        tokenSession.updateTimeout(model.getTimeout());