From 21b2851037d84c4db640b1373f783a0bebc1fe3c Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Tue, 29 Jul 2025 11:13:54 +0800
Subject: [PATCH] Merge branch 'develop'

# Conflicts:
#	app/common/logic/PermLogic.php
---
 app/common/logic/PermLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/logic/PermLogic.php b/app/common/logic/PermLogic.php
index fbd5218..9144d74 100644
--- a/app/common/logic/PermLogic.php
+++ b/app/common/logic/PermLogic.php
@@ -30,7 +30,7 @@ class PermLogic
                 $role->resources->filter(function ($resource) use($system) {
                     // var_dump($resource->toArray());
                     // 只保留需要权限认证的资源（或公共资源）
-                    return !$resource->no_auth && $system->id == $resource->system_id;
+                    return !$resource->no_auth && ($system->id == $resource->system_id || $resource->system_id == 0);
                 })
             );
         }