From 0747fc6849c35c51d383dac4f34ad27fef6f105b Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Fri, 2 Dec 2022 11:16:13 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80nickname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9fa8e331b..b37ebc039 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -705,12 +705,13 @@ class User < Owner
   end
 
   def show_real_name
-    name = lastname + firstname
-    if name.blank?
-      nickname.blank? ? login : nickname
-    else
-      name
-    end
+    # name = lastname + firstname
+    # if name.blank?
+    #   nickname.blank? ? login : nickname
+    # else
+    #   name
+    # end
+    nickname.blank? ? login : nickname
   end
 
   def update_hashed_password