fixed 用户名称统一用昵称

app/models/user.rb

@@ -560,17 +560,19 @@ class User < Owner
   def full_name
     return '游客' unless logged?
 
-    name = show_realname? ? lastname + firstname : nickname
-    name.blank? ? (nickname.blank? ? login : nickname) : name
+    # name = show_realname? ? lastname + firstname : nickname
+    # name.blank? ? (nickname.blank? ? login : nickname) : name
+    nickname.blank? ? login : nickname
   end
 
   # 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
   def real_name
     return '游客' unless logged?
-    name = lastname + firstname
-    name = name.blank? ? (nickname.blank? ? login : nickname) : name
+    # name = lastname + firstname
+    # name = name.blank? ? (nickname.blank? ? login : nickname) : name
     # name.gsub(/\s+/, '').strip    #6.11 -hs
-    name.strip
+    # name.strip
+    nickname.blank? ? login : nickname
   end
 
   def only_real_name