From df4ad9f597f44e71ec903966ded7003b6509a384 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Tue, 15 Mar 2016 09:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9C=80=E8=BF=91=E7=99=BB=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/latest_login_users.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index fb4117d26..82747eb7d 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -93,7 +93,9 @@
               </td>
               <td align="center">
                 <% if user.user_extensions.identity.to_i == 0 %>
-                    <%= user.user_extensions.school_id.nil? ? "" : (School.where("id =?", user.user_extensions.school_id)).first.try(:name) %>
+                    <!--优先取school中校名，如果校名不存在就取occupation-->
+                    <% occupation = user.user_extensions.school_id.nil? ? "" : (School.where("id =?", user.user_extensions.school_id)).first.try(:name) %>
+                    <%= occupation.blank? ? user.user_extensions.occupation : occupation %>
                  <% else %>
                     <%= user.user_extensions.occupation %>
                  <% end %>