!1 登录认证用户信息添加nickName字段(流程任务需要使用到)
Merge pull request !1 from 何文强/add_LoginUser_nickName
This commit is contained in:
@@ -94,9 +94,10 @@ public class LoginUser implements UserDetails {
|
|||||||
this.permissions = permissions;
|
this.permissions = permissions;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
|
public LoginUser(Long userId, Long deptId, String nickName, String username, String password, Set<String> permissions) {
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
this.deptId = deptId;
|
this.deptId = deptId;
|
||||||
|
this.nickName = nickName;
|
||||||
this.username = username;
|
this.username = username;
|
||||||
this.password = password;
|
this.password = password;
|
||||||
this.permissions = permissions;
|
this.permissions = permissions;
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public UserDetails createLoginUser(SysUser user) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user