From b2593ce719218c0a022acca19e12934b1770f64d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Feb 2023 10:24:34 +0800
Subject: [PATCH] resilogin-internalding

---
 .../service/impl/UserBaseInfoServiceImpl.java      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 89da786c34..8761e6cbef 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -575,11 +575,15 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setRegFlag(false);
         } else {
             //更新下user_Base_info信息
-            baseInfo.setRealName(formDTO.getNick());
-            baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
-            baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
-            baseInfo.setNickname(formDTO.getNick());
-            baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
+            if(StringUtils.isNotBlank(formDTO.getNick())){
+                baseInfo.setRealName(formDTO.getNick());
+                baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
+                baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
+                baseInfo.setNickname(formDTO.getNick());
+            }
+            if(StringUtils.isNotBlank(formDTO.getAvatarUrl())){
+                baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
+            }
             baseDao.updateById(baseInfo);
 
             result.setEpmetUserId(baseInfo.getUserId());