From c65863d60677a6e5f2d42bcc1f25caa20cf44a05 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Fri, 24 Jul 2020 21:40:26 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/controller/Role.php           |  8 ++++----
 catch/permissions/controller/User.php           |  8 ++++----
 catch/permissions/model/HasPermissionsTrait.php | 10 +++++-----
 catch/permissions/model/HasRolesTrait.php       |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/catch/permissions/controller/Role.php b/catch/permissions/controller/Role.php
index 7c38ecd..5c3e3e0 100644
--- a/catch/permissions/controller/Role.php
+++ b/catch/permissions/controller/Role.php
@@ -42,7 +42,7 @@ class Role extends CatchController
 
         $permissions = $request->param('permissions');
         if (!empty($permissions)) {
-            $this->role->attach(array_unique($permissions));
+            $this->role->attachPermissions(array_unique($permissions));
         }
         if (!empty($request->param('departments'))) {
             $this->role->attachDepartments($request->param('departments'));
@@ -88,10 +88,10 @@ class Role extends CatchController
         $detachIds = array_diff($hasPermissionIds, $existedPermissionIds);
 
         if (!empty($detachIds)) {
-            $role->detach($detachIds);
+            $role->detachPermissions($detachIds);
         }
         if (!empty($attachIds)) {
-            $role->attach(array_unique($attachIds));
+            $role->attachPermissions(array_unique($attachIds));
         }
         
         // 更新department
@@ -136,7 +136,7 @@ class Role extends CatchController
         }
         $role = $this->role->findBy($id);
         // 删除权限
-        $role->detach();
+        $role->detachPermissions();
         // 删除部门关联
         $role->detachDepartments();
         // 删除用户关联
diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php
index 9c7ec10..f797fad 100644
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -84,7 +84,7 @@ class User extends CatchController
     {
         $this->user->storeBy($request->param());
 
-        $this->user->attach($request->param('roles'));
+        $this->user->attachRoles($request->param('roles'));
 
         $this->user->attachJobs($request->param('jobs'));
 
@@ -124,11 +124,11 @@ class User extends CatchController
 
         $user = $this->user->findBy($id);
 
-        $user->detach();
+        $user->detachRoles();
         $user->detachJobs();
 
         if (!empty($request->param('roles'))) {
-            $user->attach($request->param('roles'));
+            $user->attachRoles($request->param('roles'));
         }
         if (!empty($request->param('jobs'))) {
             $user->attachJobs($request->param('jobs'));
@@ -149,7 +149,7 @@ class User extends CatchController
         foreach ($ids as $_id) {
           $user = $this->user->findBy($_id);
           // 删除角色
-          $user->detach();
+          $user->detachRoles();
           // 删除岗位
           $user->detachJobs();
 
diff --git a/catch/permissions/model/HasPermissionsTrait.php b/catch/permissions/model/HasPermissionsTrait.php
index 01158b4..29c49ff 100644
--- a/catch/permissions/model/HasPermissionsTrait.php
+++ b/catch/permissions/model/HasPermissionsTrait.php
@@ -48,7 +48,7 @@ trait HasPermissionsTrait
    * @return mixed
    * @throws \think\db\exception\DbException
    */
-  public function attach(array $permissions)
+  public function attachPermissions(array $permissions)
   {
     if (empty($permissions)) {
         return true;
@@ -62,15 +62,15 @@ trait HasPermissionsTrait
   /**
    *
    * @time 2019年12月08日
-   * @param array $roles
+   * @param array $permissions
    * @return mixed
    */
-  public function detach(array $roles = [])
+  public function detachPermissions(array $permissions = [])
   {
-    if (empty($roles)) {
+    if (empty($permissions)) {
         return $this->permissions()->detach();
     }
 
-    return $this->permissions()->detach($roles);
+    return $this->permissions()->detach($permissions);
   }
 }
diff --git a/catch/permissions/model/HasRolesTrait.php b/catch/permissions/model/HasRolesTrait.php
index 8b4cd04..072a267 100644
--- a/catch/permissions/model/HasRolesTrait.php
+++ b/catch/permissions/model/HasRolesTrait.php
@@ -30,7 +30,7 @@ trait HasRolesTrait
      * @param array $roles
      * @return mixed
      */
-    public function attach(array $roles)
+    public function attachRoles(array $roles)
     {
         if (empty($roles)) {
             return true;
@@ -47,7 +47,7 @@ trait HasRolesTrait
      * @param array $roles
      * @return mixed
      */
-    public function detach(array $roles = [])
+    public function detachRoles(array $roles = [])
     {
         if (empty($roles)) {
             return $this->roles()->detach();