diff --git a/src/main/java/com/supervision/police/controller/UserController.java b/src/main/java/com/supervision/police/controller/UserController.java index d06b2b0..50a2337 100644 --- a/src/main/java/com/supervision/police/controller/UserController.java +++ b/src/main/java/com/supervision/police/controller/UserController.java @@ -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 changePassWord(@RequestBody UserInfoReqVo userInfo) { + boolean b = userService.changePassWord(userInfo.getAccount(), userInfo.getPassword()); + return R.ok(b); } diff --git a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java index be3c703..d1ac47d 100644 --- a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java @@ -49,7 +49,7 @@ public class SystemUserServiceImpl extends ServiceImpl().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()), "该用户已被停用,请联系管理员!"); // 组装用户信息