From 77b077e2534d015f0b3d87e3eb08231e5e9a84c4 Mon Sep 17 00:00:00 2001
From: sunwen <sunwen@192.168.1.9:3000>
Date: Thu, 20 Jun 2024 18:20:27 +0800
Subject: [PATCH] feat: Change user operation log with Change User Name from x
 to x.

---
 src/dialogs/AccountFormDialog.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/dialogs/AccountFormDialog.cpp b/src/dialogs/AccountFormDialog.cpp
index 1555c9f..9db7050 100644
--- a/src/dialogs/AccountFormDialog.cpp
+++ b/src/dialogs/AccountFormDialog.cpp
@@ -213,14 +213,14 @@ bool AccountFormDialog::updateReferenceData()
                 return false;
             }
         }
-        if (!this->mCommentChanged) User::Current()->setUserName(mLeComment->text());
+        QString oldUserName = User::Current()->getUserName();
         User::Current()->setUserName(mNewUserName);
         bool ret = User::Current()->submitChange();
         if (ret)
         {
             hideWarn();
             EventCenter::Default()->triggerEvent(CurrentUserNameChanged, nullptr, nullptr);
-            LOG_USER_OPERATION("Change User Name")
+            LOG_USER_OPERATION(QString("Change User Name from %1 to %2").arg(oldUserName).arg(mNewUserName))
         }
         else
         {
@@ -233,6 +233,7 @@ bool AccountFormDialog::updateReferenceData()
         if (!this->mUserNameChanged && !this->mRoleChanged) return true;
         User user;
         if (!User::getUser(mUserID, user)) return true;
+        QString oldUserName;
         if (this->mUserNameChanged)
         {
             if (mNewUserName.isEmpty())
@@ -240,6 +241,7 @@ bool AccountFormDialog::updateReferenceData()
                 warn(tr("User Name can't be empty!"));
                 return false;
             }
+            oldUserName = user.getUserName();
             user.setUserName(mNewUserName);
         }
         if (this->mRoleChanged) user.setRoleID(mRoleID);
@@ -247,7 +249,11 @@ bool AccountFormDialog::updateReferenceData()
         bool ret = user.submitChange();
         if (ret)
         {
-            LOG_USER_OPERATION("Admin Change Acount Information")
+            LOG_USER_OPERATION("Admin Change Acount Information");
+            if(mUserNameChanged)
+            {
+                LOG_USER_OPERATION(QString("Admin Change User Name from %1 to %2").arg(oldUserName).arg(mNewUserName));
+            }
         }
         return ret;
     }