refactor: 修改菜单相关接口
This commit is contained in:
@@ -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('操作失败');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user