diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index c814d957..eafc1c62 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -254,7 +254,10 @@ class CollegesController < ApplicationController def manager_auth # unless (User.current.admin? || DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present?) - unless (User.current.admin? || DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present? || (User.current.user_extensions.try(:school_id) == @department.school_id && User.current.user_extensions.try(:identity) == 0)) + unless (User.current.admin? || + DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present? || + (User.current.user_extensions.try(:school_id) == @department.school_id && User.current.user_extensions.try(:identity) == 0) || + @department.school.try(:partner_id) == User.current.partner_id) render_403 end end diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 8ff3e358..31e42f05 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1185,6 +1185,7 @@ end @menu_type = 6 @sub_type = 3 @partners = Partner.includes(:school).order("created_at desc") + @partners = @partners.where("concat(schools.name) like ? ", "%#{params[:search]}%") unless params[:search].blank? @current_partner = nil if params[:partner] @@ -1256,7 +1257,7 @@ end customer = Customer.where(id: params[:customer]).first @current_partner = customer.partner customer.school.update_attributes(:customer_id => nil) - customer.destroy if customer && @current_partner + customer.destroy end end @@ -1293,13 +1294,14 @@ end if school_ids.length > 0 school_ids.each do |s| school = School.where("id = ?",s).first - if school.present? + if school.present? && school.partner_id.nil? partner = Partner.new(name: school.name) partner.save school.update_attributes(:partner_id => partner.id) end end end + render :json => {status: 1, message: "创建成功!"} end diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 9e07db32..0cfd2916 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -57,8 +57,6 @@ <% end %>
" + " " + " " + - " " + + " " + " " + " \n" + " \n" + diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb index 54a141a4..91eb6898 100644 --- a/app/views/managements/_partner_addManage.html.erb +++ b/app/views/managements/_partner_addManage.html.erb @@ -60,7 +60,7 @@ $.each(members,function (index,array) { s_html = s_html+ "
" + " " + - " " + + " " + " " + " \n" + ""+array["identity"]+"" + diff --git a/app/views/managements/_partner_addUnit.html.erb b/app/views/managements/_partner_addUnit.html.erb index 0d80e5a7..cb1ac7c5 100644 --- a/app/views/managements/_partner_addUnit.html.erb +++ b/app/views/managements/_partner_addUnit.html.erb @@ -59,7 +59,7 @@ s_html = s_html+ "
" + " " + " " + - " " + + " " + " " + " \n" + " \n" + diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb index 824c6093..9ccb2577 100644 --- a/app/views/managements/partners.html.erb +++ b/app/views/managements/partners.html.erb @@ -1,7 +1,7 @@