From bb4e90ca7b26852e969b30e9e977b8d0dcbf55d6 Mon Sep 17 00:00:00 2001
From: XuCheng642 <287102909@qq.com>
Date: Fri, 18 Aug 2017 10:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9A=84=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb   | 11 ++++++-----
 app/views/managements/_all_schools.html.erb |  2 +-
 app/views/managements/_depart_list.html.erb |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 118b0f2bd..7ca87b49b 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -225,13 +225,13 @@ end
       aas.update_attribute(:status, 2)
       AppliedMessage.create(:user_id => aas.user_id, :status => 2, :viewed => 0, :applied_id => aas.id, :applied_type => "ApplyAddSchools", :name => school[0].name )
       users = UserExtensions.where("school_id = #{aas.school_id}")
-      users.update_all(:school_id => school[0].id)
-      if aas.school_id != school[0].id.to_i
+      users.update_all(:school_id => school.id)
+      if aas.school_id != school.id.to_i
         aas.school.destroy
       end
-      ApplyAddDepartment.where(:school_id => aas.school_id).update_all(:school_id => school[0].id)
-      Department.where(:school_id => aas.school_id).update_all(:school_id => school[0].id)
-      aas.update_attribute(:school_id, school[0].id)
+      ApplyAddDepartment.where(:school_id => aas.school_id).update_all(:school_id => school.id)
+      Department.where(:school_id => aas.school_id).update_all(:school_id => school.id)
+      aas.update_attribute(:school_id, school.id)
     rescue Exception => e
       puts e
     end
@@ -239,6 +239,7 @@ end
     # applied_schools.update_column('name', params[:name])
     redirect_to unit_managements_path
   end
+  # 部门修改
 
   # 课堂列表
   def classroom
diff --git a/app/views/managements/_all_schools.html.erb b/app/views/managements/_all_schools.html.erb
index 2268881f3..d7a8d4c3f 100644
--- a/app/views/managements/_all_schools.html.erb
+++ b/app/views/managements/_all_schools.html.erb
@@ -8,7 +8,7 @@
     <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入名称搜索" class="task-height-40 panel-box-sizing fl edu-txt-w320 ml30" style="padding: 2px 5px" />
   </div>
   <div class="cl"></div>
-  <div id="schools_list" class="mb20 ml40 mr40">
+  <div id="schools_list" class="mt10 mb20 ml40 mr40">
     <%= render :partial => "managements/update_school_form", :locals => {:schools => schools, :edit_id => edit_id} %>
   </div>
   <span id="choose_courses_notice" class="c_red"></span>
diff --git a/app/views/managements/_depart_list.html.erb b/app/views/managements/_depart_list.html.erb
index feb0efafd..f13f2ce43 100644
--- a/app/views/managements/_depart_list.html.erb
+++ b/app/views/managements/_depart_list.html.erb
@@ -18,7 +18,7 @@
         <td class="center">
           <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_departments', :id => apply.id }, :class => "application-default-link" ) %>
           <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_departments', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure), :class => "application-default-link") %>
-          <%#=link_to '更改', all_schools_managements_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %>
+          <%#= link_to '更改',all_schools_managements_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %>
         </td>
       </tr>
   <% end %>