From 25ab9cafd51a1ca098ac2596d892f65119c23779 Mon Sep 17 00:00:00 2001
From: "mzl@hnxinyouhe.com" <mzl>
Date: Thu, 14 Aug 2025 17:48:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/ResourceService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php
index b58ff84..dc0e4e1 100644
--- a/app/common/service/ResourceService.php
+++ b/app/common/service/ResourceService.php
@@ -46,6 +46,7 @@ class ResourceService
                 $config['order']['id'] = 'asc';
                 break;
             case 'menuList':
+                $config['where']['system_id'] = ['in', [0, $p['system_id']]];
                 $config['where']['status'] = 1;
                 $config['where']['type'] = ['!=', 'permission'];
                 $config['order']['sort'] = 'asc';

From 9f8d6346110cef49b6431f3661a798b72c7f2413 Mon Sep 17 00:00:00 2001
From: "mzl@hnxinyouhe.com" <mzl>
Date: Thu, 14 Aug 2025 18:03:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/ResourceService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php
index dc0e4e1..ad3f85b 100644
--- a/app/common/service/ResourceService.php
+++ b/app/common/service/ResourceService.php
@@ -41,12 +41,12 @@ class ResourceService
         $config['model'] = $this->modelClass;
         switch ($scene) {
             case 'default':
+                $config['where']['system_id'] = ['in', [0, $p['system_id']]];
                 $config['where']['status'] = 1;
                 $config['order']['sort'] = 'asc';
                 $config['order']['id'] = 'asc';
                 break;
             case 'menuList':
-                $config['where']['system_id'] = ['in', [0, $p['system_id']]];
                 $config['where']['status'] = 1;
                 $config['where']['type'] = ['!=', 'permission'];
                 $config['order']['sort'] = 'asc';