From 437f144e79dd79f034a8283acd90ea68840cbbbb Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 1 Mar 2025 14:23:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Menu.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/v1/Menu.php b/app/admin/controller/v1/Menu.php index 3371fea6..a031b0d6 100644 --- a/app/admin/controller/v1/Menu.php +++ b/app/admin/controller/v1/Menu.php @@ -9,6 +9,7 @@ use app\admin\model\v1\SysMenuAbilityPermissionModel; use app\admin\model\v1\SysMenuModel; use app\admin\validate\v1\SysMenuValidate; use think\facade\Db; +use think\facade\Log; /** * 菜单控制器 @@ -140,6 +141,7 @@ class Menu return error($e->getMessage()); } catch (\Throwable $th) { SysMenuModel::rollback(); + Log::error($th->getMessage()); return error('操作失败'); } @@ -192,9 +194,10 @@ class Menu } // 更新菜单能力权限 - $original_ability = SysMenuAbilityPermissionModel::menuId($menu->id)->select(); - if (!$original_ability->isEmpty()) { - if (!$original_ability->delete()) { + $exists = SysMenuAbilityPermissionModel::menuId($menu->id)->count(); + if ($exists) { + $deleted = SysMenuAbilityPermissionModel::menuId($menu->id)->delete(); + if (!$deleted) { throw new InvalidOperateException('删除旧菜单能力权限失败'); } } @@ -216,6 +219,7 @@ class Menu return error($e->getMessage()); } catch (\Throwable $th) { SysMenuModel::rollback(); + Log::error($th->getMessage()); return error('操作失败'); } @@ -475,6 +479,7 @@ class Menu return error($e->getMessage()); } catch (\Throwable $th) { SysMenuModel::rollback(); + Log::error($th->getMessage()); return error('操作失败'); }