From c6490afe529de482e4c637deac3b0b8a5957aa44 Mon Sep 17 00:00:00 2001
From: pixelqm <303176530@qq.com>
Date: Fri, 20 Sep 2019 14:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81menu=E5=92=8C=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=85=B3=E8=81=94=E4=BB=A5=E5=8F=8A=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?menu=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QMPlusServer/model/dbModel/baseMenu.go       | 17 +++++++++++++++++
 QMPlusServer/model/dbModel/menu_authority.go | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/QMPlusServer/model/dbModel/baseMenu.go b/QMPlusServer/model/dbModel/baseMenu.go
index 12c9402d..3b3a3c5e 100644
--- a/QMPlusServer/model/dbModel/baseMenu.go
+++ b/QMPlusServer/model/dbModel/baseMenu.go
@@ -53,3 +53,20 @@ func (b *BaseMenu) GetInfoList(info modelInterface.PageInfo) (err error, list in
 		return err, menuList, total
 	}
 }
+
+//获取基础路由树
+func (m *BaseMenu) GetBaseMenuTree() (err error, menus []BaseMenu) {
+	err = qmsql.DEFAULTDB.Where(" parent_id = ?", 0).Find(&menus).Error
+	for i := 0; i < len(menus); i++ {
+		err = getBaseChildrenList(&menus[i])
+	}
+	return err, menus
+}
+
+func getBaseChildrenList(menu *BaseMenu) (err error) {
+	err = qmsql.DEFAULTDB.Where("parent_id = ?", menu.ID).Find(&menu.Children).Error
+	for i := 0; i < len(menu.Children); i++ {
+		err = getBaseChildrenList(&menu.Children[i])
+	}
+	return err
+}
diff --git a/QMPlusServer/model/dbModel/menu_authority.go b/QMPlusServer/model/dbModel/menu_authority.go
index c166eb3b..272559fc 100644
--- a/QMPlusServer/model/dbModel/menu_authority.go
+++ b/QMPlusServer/model/dbModel/menu_authority.go
@@ -56,20 +56,3 @@ func getChildrenList(menu *Menu) (err error) {
 	}
 	return err
 }
-
-//获取基础路由树
-func (m *BaseMenu) GetBaseMenuTree() (err error, menus []BaseMenu) {
-	err = qmsql.DEFAULTDB.Where(" parent_id = ?", 0).Find(&menus).Error
-	for i := 0; i < len(menus); i++ {
-		err = getBaseChildrenList(&menus[i])
-	}
-	return err, menus
-}
-
-func getBaseChildrenList(menu *BaseMenu) (err error) {
-	err = qmsql.DEFAULTDB.Where("parent_id = ?", menu.ID).Find(&menu.Children).Error
-	for i := 0; i < len(menu.Children); i++ {
-		err = getBaseChildrenList(&menu.Children[i])
-	}
-	return err
-}