Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/helpers/organizations_helper.rb

@@ -183,7 +183,7 @@ module OrganizationsHelper
   end
 
   def excellent_teachers
-    User.where("excellent_teacher =?",true)
+    User.where("excellent_teacher =?",true).first(5)
   end
 
 end

app/views/organizations/_org_subfield_rightM2.html.erb

@@ -1,3 +1,4 @@
+<% unless excellent_teachers.count == 0 %>
     <div class="sn-teacher-wrap" style="display:<%= field.hide == 0?'block':'none' %>;">
       <h2 class="h2-title sn-mb5"><%= field.name %>
         <%= link_to "更多", teachers_organization_path(@organization, :type => "famous"), :target => "_blank", :class => "more" %>
@@ -28,3 +29,5 @@
     <script>
         $(".sn-teacher-list:last").addClass("sn-border-none");
     </script>
+<% end  %>
+