|
|
|
@ -404,12 +404,9 @@ class User < ApplicationRecord
|
|
|
|
# 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
|
|
|
|
# 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
|
|
|
|
def real_name
|
|
|
|
def real_name
|
|
|
|
return '游客' unless logged?
|
|
|
|
return '游客' unless logged?
|
|
|
|
|
|
|
|
|
|
|
|
name = lastname + firstname
|
|
|
|
name = lastname + firstname
|
|
|
|
username = name.blank? ? (nickname.blank? ? login : nickname) : name
|
|
|
|
name.blank? ? (nickname.blank? ? login : nickname) : name
|
|
|
|
Rail.logger.info("3333333332222222#{username}")
|
|
|
|
gsub(/\s+/, '').strip #6.11 -hs
|
|
|
|
username.gsub(/\s+/, '').gsub(/\n/, '').strip #6.11 -hs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
# 用户是否选题毕设课题
|
|
|
|
# 用户是否选题毕设课题
|
|
|
|
|
