#

luxiaotao1123

2024-02-28 27ad4b75cf29448adc75a18b585a86b33531ddec

#

 zy-asrs-flow/src/pages/account/setting/components/security.jsx

@@ -8,18 +8,18 @@
import Http from '@/utils/http';

const resetPwd = async (val) => {
  const hide = message.loading('正在更新');
  const hide = message.loading('正在修改');
  try {
    const resp = await Http.doPost('api/user/update', val);
    const resp = await Http.doPost('api/user/reset/pwd', val);
    if (resp.code === 200) {
      message.success('更新成功');
      message.success('修改成功');
      return true;
    } else {
      message.error(resp.msg);
      return false;
    }
  } catch (error) {
    message.error('配置失败请重试！');
    message.error('修改失败请重试！');
    return false;
  } finally {
    hide();
@@ -32,7 +32,7 @@
  const { currentUser } = initialState || {};

  const handleFinish = (values) => {
    resetPwd({...values, userId: currentUser.id});
    resetPwd({...values, id: currentUser.id});
  }

  return (
@@ -51,7 +51,7 @@
        >
          <ProFormText.Password
            width="md"
            name="currentPwd"
            name="oldPwd"
            label="当前密码"
            rules={[
              {
@@ -62,7 +62,7 @@
          />
          <ProFormText.Password
            width="md"
            name="newPwd"
            name="password"
            label="新密码"
            rules={[
              {
@@ -81,7 +81,7 @@
          />
          <ProFormText.Password
            width="md"
            name="newPwdRepeat"
            name="passwordRepeat"
            label="确认密码"
            rules={[
              {
@@ -90,7 +90,7 @@
              },
              {
                validator(_, value) {
                  if (form.getFieldValue('newPwd') === value) return Promise.resolve();
                  if (form.getFieldValue('password') === value) return Promise.resolve();
                  return Promise.reject(new Error('两次输入的密码不相符!'));
                }
              }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java

@@ -190,7 +190,9 @@
    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())) {
                return R.error("当前密码错误");
            }
        }
        if (!Cools.isEmpty(param.getPassword())) {
            user.setPassword(userService.encodePassword(param.getPassword()));