From 130129091b67a0b3eb9bcf6ba8737be8c91a1a0b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 13:05:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(MenuLogic):=20=E4=BF=AE=E6=94=B9=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E9=9D=9E?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/logic/auth/MenuLogic.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/store/logic/auth/MenuLogic.php b/app/store/logic/auth/MenuLogic.php
index 314d54be6..6c04a48d9 100644
--- a/app/store/logic/auth/MenuLogic.php
+++ b/app/store/logic/auth/MenuLogic.php
@@ -51,15 +51,13 @@ class MenuLogic extends BaseLogic
         $where[] = ['type', 'in', ['M', 'C']];
         $where[] = ['is_disable', '=', 0];
 
-        if ($admin['is_admin'] != 1 || $admin['is_manager'] != 1) {
+        if ($admin['is_admin'] == 0 && $admin['is_manager'] == 1||$admin['is_admin'] == 0 && $admin['is_manager'] == 0) {
             $roleMenu = SystemRoleMenu::whereIn('role_id', $admin['role_id'])->column('menu_id');
             $where[] = ['id', 'in', $roleMenu];
         }
-
         $menu = SystemStoreMenu::where($where)
             ->order(['sort' => 'desc', 'id' => 'asc'])
             ->select()->toArray();
-
         return linear_to_tree($menu, 'children');
     }