Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp

@@ -5,7 +5,6 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "ChangePasswordDlg.h"
#include "UserManager.h"


// CChangePasswordDlg 对话框
@@ -82,6 +81,7 @@
        return;
    }

    SystemLogManager& logManager = SystemLogManager::getInstance();
    if (newPassword.Compare(currentPassword) == 0) {
        EndDialog(IDCANCEL);
        return;
@@ -101,12 +101,14 @@
    if (userManager.isLoggedIn() && strCurrentPassword.compare(userManager.getCurrentPass()) == 0) {
        if (changeUserPassword(userManager, strUsername, strNewPassword)) {
            EndDialog(IDOK);
         logManager.log(SystemLogManager::LogType::Info, "修改密码成功！", strUsername);
        }
    }
    else {
        if (userManager.login(strUsername, strCurrentPassword)) {
            if (changeUserPassword(userManager, strUsername, strNewPassword)) {
                EndDialog(IDOK);
                logManager.log(SystemLogManager::LogType::Info, "修改密码成功！", strUsername);
            }
            else {
                userManager.logout();