From b9da8289051937fbbbd47bbda97414ad6c769a90 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 18 七月 2024 14:37:00 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SysUserController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SysUserController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SysUserController.java
index 8fa5bea..f3c0677 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SysUserController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SysUserController.java
@@ -158,7 +158,8 @@
}
SysUser user = sysUserService.lambdaQuery()
.eq(SysUser::getAccount, sysUserRequest.getAccount())
- .eq(SysUser::getIsDelete, 0).one();
+ .eq(SysUser::getIsDelete, 0)
+ .ne(SysUser::getUserId, sysUserRequest.getUserId()).one();
if (null != user) {
return R.fail("该账号已存在！");
}
@@ -198,7 +199,7 @@
return R.fail("新密码与二次确认密码不一致，请重新输入！");
}
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- if (!passwordEncoder.matches(newPassword, oldPassword)) {
+ if (!passwordEncoder.matches(oldPassword, user.getPassword())) {
return R.fail("原密码错误，请重试！");
}
// 校验通过，加密新的明文密码
--
Gitblit v1.7.1