Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/controllers/managements_controller.rb

@@ -1368,6 +1368,7 @@ end
       after_dep = Department.where(:school_id => params[:school_id], :name => department.name).first
       if after_dep
         UserExtensions.where(:school_id => params[:applied_id], :department_id => department.id).update_all(:department_id => after_dep.id)
+        department.apply_add_departments.destroy_all
         department.destroy
       else
         department.apply_add_departments.update_all(:school_id => params[:school_id])

app/models/department.rb

@@ -4,7 +4,7 @@ class Department < ActiveRecord::Base
   # apply_add_departments 不能关联删除 tidings表有关联
   has_many :apply_add_departments
   has_many :tidings, as: :container, dependent: :destroy
-  attr_accessible :name, :school_id, :is_auth, :identifier, :is_delete
+  attr_accessible :name, :school_id, :is_auth, :identifier, :is_delete, :host_count
   scope :is_active, lambda{where(:is_delete => false)}
   scope :is_delete, lambda{where(:is_delete => true)}