From 80f829c0187cb9b0cbe630a7a875ca3a8e5657e0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 2 +-
 app/views/organizations/teachers.html.erb   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c94f734e1..62876d757 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -164,7 +164,7 @@ class OrganizationsController < ApplicationController
       return
     end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
-    @field = OrgSubfield.find(params[:org_subfield_id])
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comptec").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type == "courses" || @type.nil?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index c368adef7..dac36f7a5 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -9,8 +9,7 @@
 </div>
 <div class="resources mt10">
   <div class="function-row" id="org_teacher_search">
-    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
-                  :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'teachers', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
         <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->