educode_sales 0.9.74 → 0.9.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49bce310f13d0fc4f79490b47fb3dd691cb80447e2095e8a120746f012dc5f7a
-  data.tar.gz: eb98ae1ee690e78c4cc71f7b61256d8b82de70137aeca24ee267f44863d8854a
+  metadata.gz: 3360ea7a50189fd2b8954d7111e05c3e2592d403072661f4eca95a7f1a0ef3e1
+  data.tar.gz: af8e512e5f7e91c7eb8a211406817f19701311b205ed191982abae08cfc536dd
 SHA512:
-  metadata.gz: 236e971030f94a6b56eb815808bcdbc2095e2ac098c4058f201fe5460c0489017a93d76e414de6516648e8d4e20916f7fc72c97911ef43b8393950b4e7cd8041
-  data.tar.gz: ad2389705947bba8ed007bf0a077bfd445f88d19bece5f09b94fa8662eb354b4989fb91137735c4d76a1640f4094cb369b1eff5e99df5b652eea06931a594c3e
+  metadata.gz: df64d18c074d376248f60469c2b0dcac72eafeff9b145420bfc8aa3f9b88e610471e686263a1b26cee7d2096a4094cf533c2af3a0182134c39157aeacb57a60a
+  data.tar.gz: c3dac636495d444ac104ff6b4fdd7f65844645120127e0b1b2ccd4fe1a7a70e287dddb4e8238ef1f7b9a4c080b4aef83d8ff620d292e0c62085d793d619ad23f

data/app/controllers/educode_sales/ideas_controller.rb

@@ -27,14 +27,14 @@ module EducodeSales
               # business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               # @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
-              @ideas = Idea.where("educode_sales_ideas.staff_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
+              @ideas = Idea.where("educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
             when '区域'
               # 查看区域商机，需要排除掉其它人员手上的监管学校
               other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
 
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
               idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
-              @ideas = @ideas.joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.staff_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
+              @ideas = @ideas.joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
             else
               @ideas = @ideas
             end

data/app/views/educode_sales/ideas/_follows.html.erb

@@ -183,10 +183,10 @@
                 search_created_at: "",
                 search_content: "",
                 search_status: "",
-                search_school_name: "",
+                search_school: "",
                 search_money: "",
                 search_advise: "",
-                search_sale_staff: "",
+                search_sale_staff_id: "",
                 search_idea_staff: "",
             })
             return false;

data/app/views/educode_sales/ideas/_index.html.erb

@@ -112,7 +112,9 @@
   <% if can? :destroy, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
   <% end %>
-  <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">团队建议</a>
+  <% if can? :advise, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">团队建议</a>
+  <% end %>
   <% if can? :show_file, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="file">附件</a>
   <% end %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.74'
+  VERSION = '0.9.75'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.74
+  version: 0.9.75
 platform: ruby
 authors:
 - anke1460