diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 603084cd1..42a3491fb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -38,6 +38,11 @@ module ApplicationHelper
# super
# end
+ # 获取用户单位
+ # 优先获取高校信息，如果改信息不存在则获取occupation
+ def get_occupation_from_user user
+ School.where("id=?",user.user_extensions.school_id).first.try(:name).nil? ? user.user_extensions.occupation : School.where("id=?",user.user_extensions.school_id).first.try(:name)
+ end
def update_visiti_count container
container.update_column(:visits, container.visits + 1)
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 2a757fdee..9215782bb 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -56,8 +56,7 @@
| <%= checked_image user.admin? %> |
<%= format_time(user.created_on) %> |
<%= format_time(user.last_login_on) unless user.last_login_on.nil? %> |
- <% occupation = user.user_extensions.identity == 0 ? School.where("id=?",user.user_extensions.school_id).first.try(:name) : user.user_extensions.occupation %>
- <%= truncate( occupation, :length => 12 ) %> |
+ <%= truncate(get_occupation_from_user(user), :length => 12 ) %> |
<%= change_status_link(user) %> |
<%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> |