Commit ab52d363 authored by jiawei's avatar jiawei

修改BUG 当用户名修改后 导致当前token根据用户名获取当前用户报空指针异常

parent 9283b537
...@@ -66,8 +66,12 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -66,8 +66,12 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
if (StringUtils.isBlank(header)) { if (StringUtils.isBlank(header)) {
throw new AuthenticationException("token失效,请重新登录"); throw new AuthenticationException("token失效,请重新登录");
} }
String username = JwtTokenUtil.getUsername(header); /**
return userService.selectByUsername(username); * 决绝修改用户名会报错的问题
*/
// String username = JwtTokenUtil.getUsername(header);
String userId = JwtTokenUtil.getEmployeeId(header);
return userService.selectById(userId);
} }
/** /**
......
...@@ -263,8 +263,10 @@ public class BaseController implements Serializable { ...@@ -263,8 +263,10 @@ public class BaseController implements Serializable {
* </p> * </p>
*/ */
protected TUser getcurUser() { protected TUser getcurUser() {
String userName = getUserName(); // String userName = getUserName();
TUser user = userService.selectByUsername(userName); String userId = getUserId();
// TUser user = userService.selectByUsername(userName);
TUser user = userService.selectById(userId);
return user; return user;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment