From 34aa143fd2f2b3d233b2cca5b278bc386bfed3fa Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 5 Aug 2024 16:38:58 +0800
Subject: [PATCH] 1. fix bugs
---
.../com/supervision/police/controller/UserController.java | 6 +++---
.../police/service/impl/SystemUserServiceImpl.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
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<Boolean> 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<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()), "该用户已被停用，请联系管理员！");
// 组装用户信息