From 295f7a1c2b5e726d278d1575adfca81675184750 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 22 Mar 2019 09:34:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 7a8e6495..a0aa01bc 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1356,6 +1356,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]) From b14aaab5c93075a698ad785a256101c1c76192ab Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 22 Mar 2019 09:40:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/department.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/department.rb b/app/models/department.rb index 4f383bf4..360302f0 100644 --- a/app/models/department.rb +++ b/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)}