From 65a42dfcafa505eef21b8c4c2168a056b905b64c Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Fri, 13 Dec 2024 17:06:25 +0800
Subject: [PATCH] fix: update user

---
 .../wfc/user/controller/UProfileController.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java
index 942d06d..83b1ed2 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UProfileController.java
@@ -62,10 +62,18 @@ public class UProfileController extends BaseController
     {
         LoginUser<UUser> loginUser = SecurityUtils.getLoginUser();
         UUser currentUser = loginUser.getUser();
-        currentUser.setNickName(user.getNickName());
-        currentUser.setEmail(user.getEmail());
-        currentUser.setPhonenumber(user.getPhonenumber());
-        currentUser.setSex(user.getSex());
+        if (user.getNickName() != null) {
+            currentUser.setNickName(user.getNickName());
+        }
+        if (user.getEmail() != null) {
+            currentUser.setEmail(user.getEmail());
+        }
+        if (user.getPhonenumber() != null) {
+            currentUser.setPhonenumber(user.getPhonenumber());
+        }
+        if (user.getSex() != null) {
+            currentUser.setSex(user.getSex());
+        }
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
         {
             return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");