SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #198.
This commit is contained in:
wangqiong123
2023-11-09 09:25:49 +08:00
committed by Gitea
parent f04905b721 4e729103d6
commit 1f41b4903b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+7 -2
View File
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService; import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@ public class SysLoginController {
private SysPermissionService permissionService; private SysPermissionService permissionService;
@Autowired @Autowired
IdentityAuthenticationService identityAuthenticationService; IdentityAuthenticationService identityAuthenticationService;
@Autowired
private ISysUserService sysUserService;
/** /**
* 登录方法 * 登录方法
@@ -57,8 +60,10 @@ public class SysLoginController {
String status = identityAuthenticationService.checkIsAuthentication(identityAuthentication); String status = identityAuthenticationService.checkIsAuthentication(identityAuthentication);
ajax.put("certificationStatus", status); ajax.put("certificationStatus", status);
ajax.put("userId", SecurityUtils.getUserId()); // 获取用户信息
ajax.put("userName", SecurityUtils.getUsername()); SysUser sysUser = sysUserService.selectUserByUserName(loginBody.getUsername());
ajax.put("userId", sysUser!=null?sysUser.getUserId():"");
ajax.put("userName", sysUser!=null?sysUser.getUserName():"");
return ajax; return ajax;
} }