修改权限

catch/permissions/model/HasRolesTrait.php

@@ -13,11 +13,12 @@ trait HasRolesTrait
         return $this->belongsToMany(Roles::class, 'user_has_roles', 'role_id', 'uid');
     }
 
-    /**
-     *
-     * @time 2019年12月08日
-     * @return mixed
-     */
+  /**
+   *
+   * @time 2019年12月08日
+   * @param array $fields
+   * @return mixed
+   */
     public function getRoles()
     {
         return $this->roles()->select();
@@ -54,4 +55,4 @@ trait HasRolesTrait
 
         return $this->roles()->detach($roles);
     }
-}
+}

catch/permissions/model/Permissions.php

@@ -40,8 +40,15 @@ class Permissions extends CatchModel
                 $query->where('parent_id', $search['id'])
                     ->whereOr('id', $search['id']);
             })
-            ->when($search['permission_ids'] ?? false, function ($query) use ($search){
-                $query->whereIn('id', $search['permission_ids']);
+            ->when($search['role_id'] ?? false, function ($query) use ($search){
+                $permissionIds = [];
+                $permissions = Roles::where('id', $search['role_id'])->find()->getPermissions();
+                foreach ($permissions as $_permission) {
+                  $permissionIds[] = $_permission->pivot->permission_id;
+                }
+                if(!empty($permissionIds)) {
+                  $query->whereIn('id', $permissionIds);
+                }
             })
             ->order('sort', 'desc')
             ->order('id', 'desc')
@@ -53,4 +60,4 @@ class Permissions extends CatchModel
     {
         return $this->belongsToMany(Roles::class, 'role_has_permissions', 'role_id', 'permission_id');
     }
-}
+}