From 0638963fa13a983f4a4cb566cb12da75b3020b8f Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 4 Jun 2024 10:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/system_store/SystemStoreMenu.php    | 31 +++++++++++++++++++
 app/store/logic/auth/MenuLogic.php            |  5 +--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/common/model/system_store/SystemStoreMenu.php

diff --git a/app/common/model/system_store/SystemStoreMenu.php b/app/common/model/system_store/SystemStoreMenu.php
new file mode 100644
index 000000000..827a7a273
--- /dev/null
+++ b/app/common/model/system_store/SystemStoreMenu.php
@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\common\model\system_store;
+
+use app\common\model\BaseModel;
+
+
+/**
+ * 系统菜单
+ * Class SystemMenu
+ * @package app\common\model\auth
+ */
+class SystemStoreMenu extends BaseModel
+{
+
+
+
+}
diff --git a/app/store/logic/auth/MenuLogic.php b/app/store/logic/auth/MenuLogic.php
index e9c09816b..314d54be6 100644
--- a/app/store/logic/auth/MenuLogic.php
+++ b/app/store/logic/auth/MenuLogic.php
@@ -20,6 +20,7 @@ use app\common\logic\BaseLogic;
 use app\common\model\auth\Admin;
 use app\common\model\auth\SystemMenu;
 use app\common\model\auth\SystemRoleMenu;
+use app\common\model\system_store\SystemStoreMenu;
 use app\common\model\system_store\SystemStoreStaff;
 
 
@@ -55,9 +56,9 @@ class MenuLogic extends BaseLogic
             $where[] = ['id', 'in', $roleMenu];
         }
 
-        $menu = SystemMenu::where($where)
+        $menu = SystemStoreMenu::where($where)
             ->order(['sort' => 'desc', 'id' => 'asc'])
-            ->select();
+            ->select()->toArray();
 
         return linear_to_tree($menu, 'children');
     }