add admin user depart records

app/models/ability.rb

@@ -29,13 +29,17 @@ class Ability
         # can :update, :all
       else
         user.permissions.each do |permission|
-          if permission.model=="Order"
+          if ['Order', 'WxUser','ShopApplication','BalanceOrder'].include?(permission.model)
             D_ENUM.clear
               departs = AdminDepart.find_by_sql("select depart_record_id from admin_departs where admin_user_id = #{user.id}")
               departs.each do |dep|
                 D_ENUM.push(dep.depart_record_id)
               end
-            eval "can :#{permission.can}, #{permission.model},:depart => #{D_ENUM}"
+            if D_ENUM.length==0
+              eval "can :#{permission.can}, #{permission.model}"
+            else
+               eval "can :#{permission.can}, #{permission.model},:depart => #{D_ENUM}"
+            end
           else
             eval "can :#{permission.can}, #{permission.model}"
            end

app/models/wx_user.rb

@@ -4,6 +4,10 @@ require 'redis'
 class WxUser < ActiveRecord::Base
   has_paper_trail
   self.table_name = "wx_users"
+  scope :所有会员, -> {}
+  scope :群主, -> { where([rank: 1 ,show_invite_mode:1]) }
+  scope :店长, -> { where([rank: 2 ,show_invite_mode:1]) }
+
   belongs_to :user
   #has_many :channel_qrcode_results, :foreign_key => :mp_openid
   belongs_to :parent_signup_channel, :foreign_key => :channel_qrcode_id
@@ -95,6 +99,7 @@ class WxUser < ActiveRecord::Base
     weight -300
 
     list do
+      scopes [:所有会员,:群主,:店长]
       filters [:id,:user_id,:nickname, :city, :parent_signup_channel, :sale_group, :sale_group_sum,:active_nums,:depart]
       field :id
       field :user_id do