Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

topo_dev
liu 9 months ago
commit 36d31349ef

@ -78,9 +78,9 @@ public class UserController {
@Operation(summary = "修改密码")
@PostMapping("changePassWord")
public boolean changePassWord(@RequestBody UserInfoReqVo userInfo) {
return userService.changePassWord(userInfo.getAccount(),userInfo.getPassword());
public R<Boolean> changePassWord(@RequestBody UserInfoReqVo userInfo) {
boolean b = userService.changePassWord(userInfo.getAccount(), userInfo.getPassword());
return R.ok(b);
}

@ -49,7 +49,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
SystemUser systemUser = super.getOne(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getAccount, reqVO.getUserAccount()));
Assert.notNull(systemUser, "用户名或密码有误!");
Assert.notNull(UserUtil.checkUserPassword(reqVO.getPassword(), systemUser.getUserPd()), "用户名或密码有误!");
Assert.isTrue(UserUtil.checkUserPassword(reqVO.getPassword(), systemUser.getUserPd()), "用户名或密码有误!");
Assert.isTrue(Integer.valueOf(0).equals(systemUser.getStatus()), "该用户已被停用,请联系管理员!");
// 组装用户信息

Loading…
Cancel
Save