Files
zyt/identity-admin/integration/original-server/role-empty-grants.patch
T
2026-11-11 13:53:14 +08:00

44 lines
1.6 KiB
Diff

diff --git a/server/app/adminapi/logic/auth/RoleLogic.php b/server/app/adminapi/logic/auth/RoleLogic.php
index 66efcfec4..7f2a7222a 100755
--- a/server/app/adminapi/logic/auth/RoleLogic.php
+++ b/server/app/adminapi/logic/auth/RoleLogic.php
@@ -98,7 +98,8 @@ class RoleLogic extends BaseLogic
}
SystemRole::update($roleRow);
- if (!empty($menuId)) {
+ // 显式空数组表示收回全部权限;省略字段表示保留原授权。
+ if (array_key_exists('menu_id', $params)) {
SystemRoleMenu::where(['role_id' => $params['id']])->delete();
$data = [];
foreach ($menuId as $item) {
@@ -107,12 +108,18 @@ class RoleLogic extends BaseLogic
'menu_id' => $item,
];
}
- (new SystemRoleMenu)->insertAll($data);
+ if ($data !== []) {
+ (new SystemRoleMenu)->insertAll($data);
+ }
}
- (new AdminAuthCache())->deleteTag();
-
Db::commit();
+ try {
+ (new AdminAuthCache())->deleteTag();
+ } catch (\Throwable $cacheError) {
+ // 已提交的数据不能因缓存清理故障被误报为未保存。
+ \think\facade\Log::warning('角色授权已保存,权限缓存清理失败:role_id=' . $params['id']);
+ }
return true;
} catch (\Exception $e) {
Db::rollback();
@@ -186,4 +193,4 @@ class RoleLogic extends BaseLogic
}
-}
\ No newline at end of file
+}