Commit 2c53ee3b authored by JinPeng's avatar JinPeng

[Fix-233] [user management] Fix the bug that the user password was incorrectly modified

parent dbdfc36c
......@@ -89,6 +89,7 @@ public class UserController {
@PostMapping("/getOneById")
public Result getOneById(@RequestBody User user) {
user = userService.getById(user.getId());
user.setPassword(null);
return Result.succeed(user, "获取成功");
}
......
......@@ -46,9 +46,6 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
if (Asserts.isNull(user.getId())) {
return false;
}
if (Asserts.isNotNull(user.getPassword())) {
user.setPassword(SaSecureUtil.md5(user.getPassword()));
}
return updateById(user);
}
......
......@@ -29,7 +29,7 @@ export async function getInitialState(): Promise<{
try {
const result = await queryCurrentUser();
const currentUser: API.CurrentUser = {
name: result.datas.nickname,
name: result.datas.nickname || result.datas.username,
avatar: result.datas.avatar?result.datas.avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
userid: result.datas.username,
notifyCount: 0,
......
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