Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -575,14 +575,20 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setEpmetUserId(userEntity.getId());
             result.setRegFlag(false);
         } else {
-            //更新下user_Base_info信息
+            // 更新下user_Base_info信息
-            if(StringUtils.isNotBlank(formDTO.getNick())){
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getRealName())) {
                 baseInfo.setRealName(formDTO.getNick());
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getSurname())) {
                 baseInfo.setSurname(NameUtils.getSurNameComplex(formDTO.getNick()));
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getName())) {
                 baseInfo.setName(NameUtils.getNameComplex(formDTO.getNick()));
+            }
+            if (StringUtils.isNotBlank(formDTO.getNick()) && StringUtils.isBlank(baseInfo.getNickname())) {
                 baseInfo.setNickname(formDTO.getNick());
             }
-            if(StringUtils.isNotBlank(formDTO.getAvatarUrl())){
+            if (StringUtils.isNotBlank(formDTO.getAvatarUrl()) && StringUtils.isBlank(baseInfo.getHeadImgUrl())) {
                 baseInfo.setHeadImgUrl(formDTO.getAvatarUrl());
             }
             baseDao.updateById(baseInfo);