From b016d1eb02dd09fd1ffcd24e4e6ddee72fd1b3d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 10:27:25 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 2 +-
zy-asrs-flow/src/pages/account/setting/components/security.jsx | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-flow/src/pages/account/setting/components/security.jsx b/zy-asrs-flow/src/pages/account/setting/components/security.jsx
index 45ce4bc..83cc5fb 100644
--- a/zy-asrs-flow/src/pages/account/setting/components/security.jsx
+++ b/zy-asrs-flow/src/pages/account/setting/components/security.jsx
@@ -7,12 +7,13 @@
import { useModel } from '@umijs/max';
import Http from '@/utils/http';
-const resetPwd = async (val) => {
+const resetPwd = async (val, form) => {
const hide = message.loading('姝ｅ湪淇敼');
try {
const resp = await Http.doPost('api/user/reset/pwd', val);
if (resp.code === 200) {
message.success('淇敼鎴愬姛');
+ form.resetFields();
return true;
} else {
message.error(resp.msg);
@@ -32,7 +33,7 @@
const { currentUser } = initialState || {};
const handleFinish = (values) => {
- resetPwd({...values, id: currentUser.id});
+ resetPwd({...values, id: currentUser.id}, form);
}
return (
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index c5f2ec1..8e5b456 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -190,7 +190,7 @@
public R resetPwd(@RequestBody ResetPwdParam param) {
User user = userService.getById(param.getId());
if (!Cools.isEmpty(param.getOldPwd())) {
- if (!userService.encodePassword(param.getOldPwd()).equals(user.getPassword())) {
+ if (!userService.comparePassword(user.getPassword(), param.getOldPwd())) {
return R.error("褰撳墠瀵嗙爜閿欒");
}
}
--
Gitblit v1.9.1