木易华康-获取昵称调整

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -207,11 +207,11 @@ public class FsUser extends BaseEntity
 
     public String getNickName()
     {
-        if(StringUtils.isNotEmpty(nickName)){
-            return EmojiParser.parseToUnicode(nickName);
-        }
-        else{
-            return nickName;
+        String value = StringUtils.isNotEmpty(nickName) ? nickName : nickname;
+        if(StringUtils.isNotEmpty(value)){
+            return EmojiParser.parseToUnicode(value);
+        } else {
+            return value;
         }
     }
 
@@ -247,7 +247,12 @@ public class FsUser extends BaseEntity
 //    private String keywords;
 
     public String getNickname() {
-        return nickname;
+        String value = StringUtils.isNotEmpty(nickName) ? nickName : nickname;
+        if(StringUtils.isNotEmpty(value)){
+            return EmojiParser.parseToUnicode(value);
+        } else {
+            return value;
+        }
     }
 
     public void setNickname(String nickname) {