From c95a8c60fdfa5a881de45b326a1121f9ef045401 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 4 Apr 2019 16:47:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 3 ++- app/views/managements/_customer_addUnit.html.erb | 2 +- app/views/managements/_partner_addManage.html.erb | 2 +- app/views/managements/_partner_addUnit.html.erb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 8ff3e358..56d0fc72 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1293,13 +1293,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/managements/_customer_addUnit.html.erb b/app/views/managements/_customer_addUnit.html.erb index 28ff3f36..82f880f4 100644 --- a/app/views/managements/_customer_addUnit.html.erb +++ b/app/views/managements/_customer_addUnit.html.erb @@ -61,7 +61,7 @@ s_html = s_html+ "

" + " " + " " + - " " + + " " + " " + " \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" + From 962269895386555743b93629073ce946002a3f57 Mon Sep 17 00:00:00 2001 From: jasder Date: Thu, 4 Apr 2019 16:50:40 +0800 Subject: [PATCH 2/5] FIX --- app/controllers/managements_controller.rb | 1 + app/views/managements/partners.html.erb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 69f7bdbc..6db6647d 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1175,6 +1175,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] diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb index 7ba9fecb..f2805058 100644 --- a/app/views/managements/partners.html.erb +++ b/app/views/managements/partners.html.erb @@ -1,7 +1,7 @@

- - 搜索 + + 搜索 清除
@@ -75,4 +75,8 @@ }) + + function submit_search_partner(){ + $.get("/managements/partners?search="+$("#partner_search").val()); + } \ No newline at end of file From 14be55dca854219762d72ab7581b3f414865e45a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 4 Apr 2019 16:55:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/colleges_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 2e3c438d79d9ac03911d60ba2b0123e2574c33f1 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 4 Apr 2019 16:59:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 2 -- 1 file changed, 2 deletions(-) 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 %>
  • <%= link_to '我的项目', user_path(User.current, :type => 'a_project') %>
    • -
  • 客户管理
    • - <% if User.current.department_members.count > 0 %>
  • <%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %>
    • <% end %> From 80cdbd6ad357ce60e8e15c52350e26236d802f4b Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 4 Apr 2019 17:11:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 733cd1fb..31e42f05 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1257,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