diff --git a/app/views/admin/latest_login_teachers.html.erb b/app/views/admin/latest_login_teachers.html.erb
index 05f20ba8d..3c4eb3c5b 100644
--- a/app/views/admin/latest_login_teachers.html.erb
+++ b/app/views/admin/latest_login_teachers.html.erb
@@ -45,6 +45,9 @@
用户身份
|
+
+ 用户单位
+ |
@@ -59,7 +62,7 @@
<%=format_time(teacher.last_login_on) %>
- <%=teacher.user_id %>
+ <%= teacher.user_id %>
|
<%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
<% if teacher.try(:realname) == ' '%>
@@ -69,11 +72,14 @@
<% end %>
|
- <%=link_to(teacher.login, user_path(teacher.user_id)) %>
+ <%= link_to(teacher.login, user_path(teacher.user_id)) %>
|
老师
|
+
+ <%= teacher.school_id.nil? ? "" : (School.find teacher.school_id).try(:name) %>
+ |
<% end %>
diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index 17680a8c8..10f7bcea1 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -46,6 +46,9 @@
用户身份
|
+
+ 用户单位
+ |
@@ -88,6 +91,13 @@
<% end %>
<% end%>
+
+ <% if User.current.user_extensions.identity == "0" %>
+ <%= user.user_extensions.school_id.nil? ? "" : (School.where("id =?", user.user_extensions.school_id)).first.try(:name) %>
+ <% else %>
+ <%= user.user_extensions.occupation %>
+ <% end %>
+ |
<% end %>