更新
This commit is contained in:
@@ -21,6 +21,9 @@ use app\common\model\auth\Admin;
|
||||
use app\common\model\auth\SystemMenu;
|
||||
use app\common\model\auth\SystemRoleMenu;
|
||||
use app\common\service\qywx\QywxPromotionOperatorAccess;
|
||||
use app\adminapi\service\AdminAccessSyncService;
|
||||
use think\facade\Db;
|
||||
use app\common\service\ActiveMenuPermissions;
|
||||
|
||||
|
||||
/**
|
||||
@@ -49,6 +52,7 @@ class MenuLogic extends BaseLogic
|
||||
$where = [];
|
||||
$where[] = ['type', 'in', ['M', 'C']];
|
||||
$where[] = ['is_disable', '=', 0];
|
||||
$where[] = ['id', 'in', ActiveMenuPermissions::ids()];
|
||||
|
||||
if ($admin['root'] != 1) {
|
||||
$roleMenu = SystemRoleMenu::whereIn('role_id', $admin['role_id'])->column('menu_id');
|
||||
@@ -92,12 +96,14 @@ class MenuLogic extends BaseLogic
|
||||
$result = [];
|
||||
foreach ($pageIds as $pageId) {
|
||||
$chain = [];
|
||||
$seen = [];
|
||||
$currentId = $pageId;
|
||||
while ($currentId > 0) {
|
||||
if (!isset($byId[$currentId])) {
|
||||
if (isset($seen[$currentId]) || !isset($byId[$currentId])) {
|
||||
$chain = [];
|
||||
break;
|
||||
}
|
||||
$seen[$currentId] = true;
|
||||
$chain[] = $currentId;
|
||||
$currentId = (int) ($byId[$currentId]['pid'] ?? 0);
|
||||
}
|
||||
@@ -144,7 +150,7 @@ class MenuLogic extends BaseLogic
|
||||
*/
|
||||
public static function edit(array $params)
|
||||
{
|
||||
return SystemMenu::update([
|
||||
return self::mutate((int) $params['id'], static fn () => SystemMenu::update([
|
||||
'id' => $params['id'],
|
||||
'pid' => $params['pid'],
|
||||
'type' => $params['type'],
|
||||
@@ -159,7 +165,7 @@ class MenuLogic extends BaseLogic
|
||||
'is_cache' => $params['is_cache'],
|
||||
'is_show' => $params['is_show'],
|
||||
'is_disable' => $params['is_disable'],
|
||||
]);
|
||||
]));
|
||||
}
|
||||
|
||||
|
||||
@@ -184,10 +190,10 @@ class MenuLogic extends BaseLogic
|
||||
*/
|
||||
public static function delete($params)
|
||||
{
|
||||
// 删除菜单
|
||||
SystemMenu::destroy($params['id']);
|
||||
// 删除角色-菜单表中 与该菜单关联的记录
|
||||
SystemRoleMenu::where(['menu_id' => $params['id']])->delete();
|
||||
self::mutate((int) $params['id'], static function () use ($params): void {
|
||||
SystemMenu::destroy($params['id']);
|
||||
SystemRoleMenu::where(['menu_id' => $params['id']])->delete();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -200,10 +206,24 @@ class MenuLogic extends BaseLogic
|
||||
*/
|
||||
public static function updateStatus(array $params)
|
||||
{
|
||||
return SystemMenu::update([
|
||||
return self::mutate((int) $params['id'], static fn () => SystemMenu::update([
|
||||
'id' => $params['id'],
|
||||
'is_disable' => $params['is_disable']
|
||||
]);
|
||||
]));
|
||||
}
|
||||
|
||||
private static function mutate(int $menuId, callable $operation)
|
||||
{
|
||||
$adminIds = [];
|
||||
$tokens = [];
|
||||
$result = Db::transaction(static function () use ($menuId, $operation, &$adminIds, &$tokens) {
|
||||
SystemMenu::where('id', $menuId)->lock(true)->findOrEmpty();
|
||||
$adminIds = AdminAccessSyncService::menuAdminIds($menuId);
|
||||
$tokens = AdminAccessSyncService::revoke($adminIds);
|
||||
return $operation();
|
||||
});
|
||||
AdminAccessSyncService::clearCommitted($adminIds, $tokens);
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user