From 514063d3fb10ca483e1d2cf87823fac73a5d872e Mon Sep 17 00:00:00 2001
From: DemoJameson <demojameson@gmail.com>
Date: Thu, 29 Jan 2026 11:31:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E5=90=8E=E4=BF=9D=E5=AD=98=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/UserAddEditDialog.vue | 9 ++++-----
 src/views/user/UserProfileView.vue          | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/dialog/UserAddEditDialog.vue b/src/components/dialog/UserAddEditDialog.vue
index cb429068..4a1695ca 100644
--- a/src/components/dialog/UserAddEditDialog.vue
+++ b/src/components/dialog/UserAddEditDialog.vue
@@ -199,6 +199,7 @@ async function fetchUserInfo() {
     userForm.value = await api.get(`user/${props.username}`)
     if (userForm.value) {
       userForm.value.avatar = userForm.value.avatar || avatar1
+      userForm.value.nickname = userForm.value.settings?.nickname ?? ''
       currentAvatar.value = userForm.value.avatar
       currentUserName.value = userForm.value.name
       userName.value = userForm.value.name
@@ -273,12 +274,10 @@ async function updateUser() {
   }
 
   // 将nickname保存到settings中，后端可以直接处理JSON对象
-  if (userForm.value.nickname) {
-    if (!userForm.value.settings) {
-      userForm.value.settings = {}
-    }
-    userForm.value.settings.nickname = userForm.value.nickname
+  if (!userForm.value.settings) {
+    userForm.value.settings = {}
   }
+  userForm.value.settings.nickname = userForm.value.nickname ?? ''
 
   const oldUserName = userForm.value.name
   userForm.value.name = currentUserName.value
diff --git a/src/views/user/UserProfileView.vue b/src/views/user/UserProfileView.vue
index e95b6944..2e18fb62 100644
--- a/src/views/user/UserProfileView.vue
+++ b/src/views/user/UserProfileView.vue
@@ -162,12 +162,10 @@ async function saveAccountInfo() {
   }
 
   // 将nickname保存到settings中，后端可以直接处理JSON对象
-  if (accountInfo.value.nickname) {
-    if (!accountInfo.value.settings) {
-      accountInfo.value.settings = {}
-    }
-    accountInfo.value.settings.nickname = accountInfo.value.nickname
+  if (!accountInfo.value.settings) {
+    accountInfo.value.settings = {}
   }
+  accountInfo.value.settings.nickname = accountInfo.value.nickname ?? ''
 
   const oldUserName = accountInfo.value.name
   const oldAvatar = accountInfo.value.avatar