From 96f65f338cbcb8bf30a54d50c2bde96b9bd262a7 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Mon, 14 Mar 2016 17:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/latest_login_teachers.html.erb | 10 ++++++++--
 app/views/admin/latest_login_users.html.erb    | 10 ++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

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 @@
       <th style="width: 50px;">
         用户身份
       </th>
+      <th style="width: 50px;">
+        用户单位
+      </th>
     </tr>
     </thead>
     <tbody>
@@ -59,7 +62,7 @@
             <%=format_time(teacher.last_login_on) %>
           </td>
           <td align="center">
-            <%=teacher.user_id %>
+            <%= teacher.user_id %>
           </td>
           <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if teacher.try(:realname) == ' '%><%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
             <% if teacher.try(:realname) == ' '%>
@@ -69,11 +72,14 @@
             <% end %>
           </td>
           <td align="center">
-            <%=link_to(teacher.login, user_path(teacher.user_id)) %>
+            <%= link_to(teacher.login, user_path(teacher.user_id)) %>
           </td>
           <td align="center">
             老师
           </td>
+          <td align="center">
+                <%= teacher.school_id.nil? ? "" : (School.find teacher.school_id).try(:name) %>
+          </td>
         </tr>
     <% end %>
     </tbody>
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 @@
       <th style="width: 50px;">
         用户身份
       </th>
+      <th style="width: 50px;">
+        用户单位
+      </th>
     </tr>
     </thead>
     <tbody>
@@ -88,6 +91,13 @@
                     <% end %>
                 <% end%>
               </td>
+              <td align="center">
+                <% 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 %>
+              </td>
             </tr>
         <% end %>
     </tbody>