|
|
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
|
|
3
|
3
|
import java.util.List;
|
|
4
|
4
|
import java.util.Set;
|
|
5
|
5
|
|
|
|
6
|
+import com.ruoyi.system.service.ISysUserService;
|
|
6
|
7
|
import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
|
|
7
|
8
|
import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService;
|
|
8
|
9
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -37,6 +38,8 @@ public class SysLoginController {
|
|
37
|
38
|
private SysPermissionService permissionService;
|
|
38
|
39
|
@Autowired
|
|
39
|
40
|
IdentityAuthenticationService identityAuthenticationService;
|
|
|
41
|
+ @Autowired
|
|
|
42
|
+ private ISysUserService sysUserService;
|
|
40
|
43
|
|
|
41
|
44
|
/**
|
|
42
|
45
|
* 登录方法
|
|
|
@@ -57,8 +60,10 @@ public class SysLoginController {
|
|
57
|
60
|
String status = identityAuthenticationService.checkIsAuthentication(identityAuthentication);
|
|
58
|
61
|
|
|
59
|
62
|
ajax.put("certificationStatus", status);
|
|
60
|
|
- ajax.put("userId", SecurityUtils.getUserId());
|
|
61
|
|
- ajax.put("userName", SecurityUtils.getUsername());
|
|
|
63
|
+ // 获取用户信息
|
|
|
64
|
+ SysUser sysUser = sysUserService.selectUserByUserName(loginBody.getUsername());
|
|
|
65
|
+ ajax.put("userId", sysUser!=null?sysUser.getUserId():"");
|
|
|
66
|
+ ajax.put("userName", sysUser!=null?sysUser.getUserName():"");
|
|
62
|
67
|
return ajax;
|
|
63
|
68
|
}
|
|
64
|
69
|
|