From f9c551ba6ac3cc4316ae6e8b215bf6e2607875d5 Mon Sep 17 00:00:00 2001 From: Boen_Shi Date: Thu, 30 Apr 2026 11:29:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=BA=90=E6=9D=83=E9=99=90):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=BA=A7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=A4=87=E6=B3=A8=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 服务器级权限备注改为仅服务器显示名称 - 兼容旧权限描述格式,避免未命名服务器分组异常 --- app/Http/Controllers/Api/ServerResourceController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/Api/ServerResourceController.php b/app/Http/Controllers/Api/ServerResourceController.php index 96a7620..41d917f 100644 --- a/app/Http/Controllers/Api/ServerResourceController.php +++ b/app/Http/Controllers/Api/ServerResourceController.php @@ -577,6 +577,12 @@ class ServerResourceController extends Controller public static function resourcePermissionDescription(ServerResource $resource): string { $resource->loadMissing('parent'); + if (! $resource->parent_id) { + $serverLabel = trim((string) ($resource->display_name ?: $resource->name ?: '未命名服务器')); + + return sprintf('服务器资源访问权限(%s,资源ID: %d)', $serverLabel, (int) $resource->id); + } + $serverLabel = trim((string) ($resource->parent?->display_name ?: $resource->parent?->name ?: '未命名服务器')); $resourceLabel = trim((string) ($resource->display_name ?: $resource->name ?: '未命名资源'));