From 1bc10958f550ac85277dc7bb0073b1818cd23128 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Thu, 26 Sep 2019 18:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BC=96=E8=BE=91=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QMPlusServer/controller/api/menu.go    | 23 +++++++++++++++++++++++
 QMPlusServer/model/dbModel/baseMenu.go |  9 +++++++--
 QMPlusServer/router/menu.go            |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/QMPlusServer/controller/api/menu.go b/QMPlusServer/controller/api/menu.go
index b26bf643..8a2db0ba 100644
--- a/QMPlusServer/controller/api/menu.go
+++ b/QMPlusServer/controller/api/menu.go
@@ -174,3 +174,26 @@ func UpdataBaseMenu(c *gin.Context) {
 		servers.ReportFormat(c, true, "修改成功", gin.H{})
 	}
 }
+
+type GetById struct {
+	Id float64 `json:"id"`
+}
+
+// @Tags menu
+// @Summary 根据id获取菜单
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body api.GetById true "根据id获取菜单"
+// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /menu/getBaseMenuById [post]
+func GetBaseMenuById(c *gin.Context) {
+	var idInfo GetById
+	_ = c.BindJSON(&idInfo)
+	err, menu := new(dbModel.BaseMenu).GetBaseMenuById(idInfo.Id)
+	if err != nil {
+		servers.ReportFormat(c, false, fmt.Sprintf("查询失败：%v", err), gin.H{})
+	} else {
+		servers.ReportFormat(c, true, "查询成功", gin.H{"menu": menu})
+	}
+}
diff --git a/QMPlusServer/model/dbModel/baseMenu.go b/QMPlusServer/model/dbModel/baseMenu.go
index a32fa25e..bba2d671 100644
--- a/QMPlusServer/model/dbModel/baseMenu.go
+++ b/QMPlusServer/model/dbModel/baseMenu.go
@@ -46,7 +46,7 @@ func (b *BaseMenu) DeleteBaseMenu(id float64) (err error) {
 
 func (b *BaseMenu) UpdataBaseMenu() (err error) {
 	upDataMap := make(map[string]interface{})
-	upDataMap["parentId"] = b.ParentId
+	upDataMap["parent_id"] = b.ParentId
 	upDataMap["path"] = b.Path
 	upDataMap["name"] = b.Name
 	upDataMap["hidden"] = b.Hidden
@@ -54,11 +54,16 @@ func (b *BaseMenu) UpdataBaseMenu() (err error) {
 	upDataMap["title"] = b.Title
 	upDataMap["icon"] = b.Icon
 	err = qmsql.DEFAULTDB.Where("id = ?", b.ID).Find(&BaseMenu{}).Updates(upDataMap).Error
-	err1 := qmsql.DEFAULTDB.Where("menu_id = ?", b.ID).Find(&Menu{}).Updates(upDataMap).Error
+	err1 := qmsql.DEFAULTDB.Where("menu_id = ?", b.ID).Find(&[]Menu{}).Updates(upDataMap).Error
 	fmt.Printf("菜单修改时候，关联菜单err:%v", err1)
 	return err
 }
 
+func (b *BaseMenu) GetBaseMenuById(id float64) (err error, menu BaseMenu) {
+	err = qmsql.DEFAULTDB.Where("id = ?", id).First(&menu).Error
+	return
+}
+
 func (b *BaseMenu) GetInfoList(info modelInterface.PageInfo) (err error, list interface{}, total int) {
 	// 封装分页方法 调用即可 传入 当前的结构体和分页信息
 	err, db, total := servers.PagingServer(b, info)
diff --git a/QMPlusServer/router/menu.go b/QMPlusServer/router/menu.go
index e8a867a7..f574abb7 100644
--- a/QMPlusServer/router/menu.go
+++ b/QMPlusServer/router/menu.go
@@ -17,5 +17,6 @@ func InitMenuRouter(Router *gin.Engine) {
 		MenuRouter.POST("getMenuAuthority", api.GetMenuAuthority)
 		MenuRouter.POST("deleteBaseMenu", api.DeleteBaseMenu)
 		MenuRouter.POST("updataBaseMenu", api.UpdataBaseMenu)
+		MenuRouter.POST("getBaseMenuById", api.GetBaseMenuById)
 	}
 }
-- 
GitLab