From 8e22570166377c93c99b6b73e97fecf064612425 Mon Sep 17 00:00:00 2001 From: hewenqiang <1527468660@qq.com> Date: Tue, 28 Dec 2021 16:25:15 +0800 Subject: [PATCH] =?UTF-8?q?add=20--=20=E7=99=BB=E5=BD=95=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0nickName?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8=E5=88=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/domain/model/LoginUser.java | 3 ++- .../com/ruoyi/system/service/impl/UserDetailsServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index 1be53263..7211d1a4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -94,9 +94,10 @@ public class LoginUser implements UserDetails { this.permissions = permissions; } - public LoginUser(Long userId, Long deptId, String username, String password, Set permissions) { + public LoginUser(Long userId, Long deptId, String nickName, String username, String password, Set permissions) { this.userId = userId; this.deptId = deptId; + this.nickName = nickName; this.username = username; this.password = password; this.permissions = permissions; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java index 14801e9d..ee420b71 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java @@ -47,6 +47,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { } public UserDetails createLoginUser(SysUser user) { - return new LoginUser(user.getUserId(), user.getDeptId(), user.getUserName(), user.getPassword(), permissionService.getMenuPermission(user)); + return new LoginUser(user.getUserId(), user.getDeptId(), user.getNickName(), user.getUserName(), user.getPassword() + , permissionService.getMenuPermission(user)); } }