|
@@ -159,8 +159,7 @@ public class UserController {
|
|
|
loginUser.setPermissions(permissions);
|
|
loginUser.setPermissions(permissions);
|
|
|
tokenService.refreshToken(loginUser);
|
|
tokenService.refreshToken(loginUser);
|
|
|
}
|
|
}
|
|
|
- AjaxResult ajax = AjaxResult.success();
|
|
|
|
|
- ajax.put("user", user);
|
|
|
|
|
|
|
+ AjaxResult ajax = AjaxResult.success(user);
|
|
|
ajax.put("card", loginUser.getCard());
|
|
ajax.put("card", loginUser.getCard());
|
|
|
ajax.put("roles", roles);
|
|
ajax.put("roles", roles);
|
|
|
ajax.put("permissions", permissions);
|
|
ajax.put("permissions", permissions);
|