From 8e783e2ea27eaa9478143f1311f9b344e6d2650f Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 4 Jul 2023 17:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dao/adminMenu.go | 9 +++++++++
 api/service/menu.go  | 2 +-
 api/service/role.go  | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/api/dao/adminMenu.go b/api/dao/adminMenu.go
index d8bfe4c..56be364 100644
--- a/api/dao/adminMenu.go
+++ b/api/dao/adminMenu.go
@@ -45,6 +45,15 @@ func (r *AdminMenuDao) GetAdminMenuListNormalSortOrderNum() (m []*model.AdminMen
 	return m, nil
 }
 
+// GetAdminMenuListNonButtonNormalSortOrderNum 获取全部正常非按钮菜单列表-排序
+func (r *AdminMenuDao) GetAdminMenuListNonButtonNormalSortOrderNum() (m []*model.AdminMenu, err error) {
+	err = global.Db.Where("menu_status = ?", 1).Where("menu_type != ?", 3).Order("order_num asc").Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // AddAdminMenu 新增菜单
 func (r *AdminMenuDao) AddAdminMenu(tx *gorm.DB, model *model.AdminMenu) (*model.AdminMenu, error) {
 	if err := tx.Create(model).Error; err != nil {
diff --git a/api/service/menu.go b/api/service/menu.go
index 7bee8e9..15404f4 100644
--- a/api/service/menu.go
+++ b/api/service/menu.go
@@ -17,7 +17,7 @@ type MenuService struct{}
 func (r *MenuService) GetMenuList() ([]*menuResponse.GetMenuList, error) {
 	// 获取全部菜单
 	AdminMenuDao := dao.AdminMenuDao{}
-	adminMenu, _ := AdminMenuDao.GetAdminMenuListSortOrderNum()
+	adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
 	if adminMenu == nil {
 		return nil, nil
 	}
diff --git a/api/service/role.go b/api/service/role.go
index 9c245cd..17a21ae 100644
--- a/api/service/role.go
+++ b/api/service/role.go
@@ -34,8 +34,8 @@ func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleRespon
 		}
 	}
 
-	// 获取全部正常菜单列表
-	adminMenu, _ := AdminMenuDao.GetAdminMenuListNormalSortOrderNum()
+	// 获取全部正常非按钮菜单列表
+	adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
 	if adminMenu == nil {
 		return []*roleResponse.GetRoleMenuList{}, nil
 	}