From 1f30ead7746c2fd44a3a96cd66a2ab44298ee7f5 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Sun, 16 May 2021 17:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/controller/Permission.php | 34 +++------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/catch/permissions/controller/Permission.php b/catch/permissions/controller/Permission.php
index a42eac2..c21fc9a 100644
--- a/catch/permissions/controller/Permission.php
+++ b/catch/permissions/controller/Permission.php
@@ -103,45 +103,19 @@ class Permission extends CatchController
 
         // 按钮类型
         if ($params['type'] == Permissions::BTN_TYPE && $permission->parent_id) {
-            $parentPermission = $this->permissions->findBy($permission->parent_id);
-
-            $permissionMark = $params['permission_mark'];
-            if ($parentPermission->parent_id) {
-                if (Str::contains($parentPermission->permission_mark, '@')) {
-                    list($controller, $action) = explode('@', $parentPermission->permission_mark);
-                    $permissionMark = $controller . '@' . $permissionMark;
-                } else {
-                    $permissionMark = $parentPermission->permission_mark .'@'. $permissionMark;
-                }
-            }
-
-            $params['permission_mark'] = $permissionMark;
-
-
-            $this->permissions->where('id',$id)->update(array_merge($params, [
-                'parent_id' => $permission->parent_id,
-                'level'     => $permission->level,
-                'updated_at' => time()
-            ]));
-
-            return CatchResponse::success();
+            return CatchResponse::success($this->permissions->updateButton($params, $permission));
         }
 
-        $params = array_merge($request->param(), [
+        $params = array_merge($params, [
             'parent_id' => $permission->parent_id,
             'level'     => $permission->level
         ]);
 
-        if ($permission->updateBy($id, $params)) {
-            if ($params['module'] ?? false) {
-                $this->permissions->updateBy($permission->id, [
-                    'module' => $params['module'],
-                ], 'parent_id');
-            }
+        if ($this->permissions->updateMenu($id, $params)) {
             return CatchResponse::success();
         }
 
-       throw new FailedException('更新失败');
+        throw new FailedException('更新失败');
     }
 
     /**