给用户增加所属公司

给权限增加所属公司

app/controllers/roles_controller.rb

@@ -18,7 +18,7 @@ def index
       return
     end
 
-    @roles = Role.order('name').paginate(:page => params[:page])
+    @roles = Role.where('company_id=?', @current_user.company_id).order('name').paginate(:page => params[:page])
     render 'admin/roles/index'
   end
 
@@ -53,7 +53,7 @@ def create
       return
     end
     @role = Role.new(params[:role])
-
+    @role.company_id = @current_user.company_id
     if @role.save
       params[:role][:privilege_ids] ||= []
       if @role.update_attributes(params[:role])

app/controllers/users_controller.rb

@@ -11,9 +11,9 @@ def index
       return
     end
     if params.has_key?('name')
-      @users = User.where('name like ?', "%#{params[:name]}%").paginate(:page => params[:page])
+      @users = User.where('name like ? and company_id=?', "%#{params[:name]}%", current_user.company_id).paginate(:page => params[:page])
     else
-      @users = User.paginate(:page => params[:page])
+      @users = User.where('company_id=?', current_user.company_id).paginate(:page => params[:page])
     end
     render 'admin/users/index'
   end
@@ -51,7 +51,7 @@ def create
       return
     end
     @user = User.new(params[:user])
-
+    @user.company_id = @current_user.company_id
     if @user.save
       flash.now[:error] = '注册成功.'
       redirect_back_or_default user_path
@@ -70,7 +70,6 @@ def update
     end
     @user = User.find(params[:id])
 
-
     if @user.update_attributes(params[:user])
       redirect_to(@user, :notice => '保存用户成功.')
 

db/migrate/20140716140020_add_company_to_user.rb

@@ -0,0 +1,8 @@
+class AddCompanyToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :company_id, :integer
+
+    add_index :users, :name
+    add_index :users, :company_id
+  end
+end

db/migrate/20140716140454_add_company_to_role.rb

@@ -0,0 +1,7 @@
+class AddCompanyToRole < ActiveRecord::Migration
+  def change
+    add_column :roles, :company_id, :integer
+
+    add_index :roles, :company_id
+  end
+end