jsasg/orico-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

refactor: 修改菜单相关接口

Browse Source
This commit is contained in:
jsasg
2025-03-01 14:23:44 +08:00
parent 46de750974
commit e4ec90478f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/admin/controller/v1/Menu.php
View File

@@ -9,6 +9,7 @@ use app\admin\model\v1\SysMenuAbilityPermissionModel;
use app\admin\model\v1\SysMenuModel; use app\admin\model\v1\SysMenuModel;
use app\admin\validate\v1\SysMenuValidate; use app\admin\validate\v1\SysMenuValidate;
use think\facade\Db; use think\facade\Db;
use think\facade\Log;
/** /**
* 菜单控制器 * 菜单控制器
@@ -140,6 +141,7 @@ class Menu
return error($e->getMessage()); return error($e->getMessage());
} catch (\Throwable $th) { } catch (\Throwable $th) {
SysMenuModel::rollback(); SysMenuModel::rollback();
Log::error($th->getMessage());
return error('操作失败'); return error('操作失败');
} }
@@ -192,9 +194,10 @@ class Menu
} }
// 更新菜单能力权限 // 更新菜单能力权限
$original_ability = SysMenuAbilityPermissionModel::menuId($menu->id)->select(); $exists = SysMenuAbilityPermissionModel::menuId($menu->id)->count();
if (!$original_ability->isEmpty()) { if ($exists) {
if (!$original_ability->delete()) { $deleted = SysMenuAbilityPermissionModel::menuId($menu->id)->delete();
if (!$deleted) {
throw new InvalidOperateException('删除旧菜单能力权限失败'); throw new InvalidOperateException('删除旧菜单能力权限失败');
} }
} }
@@ -216,6 +219,7 @@ class Menu
return error($e->getMessage()); return error($e->getMessage());
} catch (\Throwable $th) { } catch (\Throwable $th) {
SysMenuModel::rollback(); SysMenuModel::rollback();
Log::error($th->getMessage());
return error('操作失败'); return error('操作失败');
} }
@@ -475,6 +479,7 @@ class Menu
return error($e->getMessage()); return error($e->getMessage());
} catch (\Throwable $th) { } catch (\Throwable $th) {
SysMenuModel::rollback(); SysMenuModel::rollback();
Log::error($th->getMessage());
return error('操作失败'); return error('操作失败');
} }