|
@@ -191,8 +191,12 @@ public class SysUserController extends BaseController
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
int result = userService.updateUser(user);
|
|
int result = userService.updateUser(user);
|
|
if(result>0){
|
|
if(result>0){
|
|
- // 更新缓存用户
|
|
|
|
- loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
|
|
|
|
|
|
+ SysUser newUser = userService.selectUserByUserName(loginUser.getUser().getUserName());
|
|
|
|
+ //同个用户ID则更新用户信息,admin操作则不更新
|
|
|
|
+ if(newUser.getUserId()==loginUser.getUser().getUserId()){
|
|
|
|
+ // 更新缓存用户
|
|
|
|
+ loginUser.setUser(newUser);
|
|
|
|
+ }
|
|
tokenService.setLoginUser(loginUser);
|
|
tokenService.setLoginUser(loginUser);
|
|
}
|
|
}
|
|
return toAjax(result);
|
|
return toAjax(result);
|