修改菜单保存信息

backend/src/dashoo.cn/modi_webapi/app/api/system/menu/menu.go

@@ -4,8 +4,9 @@ import (
 	"context"
 	protoMenu "dashoo.cn/common_proto/menu"
 	"dashoo.cn/micro_libary/microsrv"
-	"dashoo.cn/micro_libary/response"
+	"dashoo.cn/modi_webapi/library/response"
 	"github.com/gogf/gf/net/ghttp"
+	"reflect"
 	"strconv"
 )
 
@@ -30,11 +31,11 @@ func (c *Controller) GetList(r *ghttp.Request) {
 	})
 
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "数据获取异常", err.Error())
 	} else {
 		var records response.PagedRecords
 		records.Records = rsp.List
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }
 
@@ -46,7 +47,7 @@ func (c *Controller) GetEntityById(r *ghttp.Request) {
 		Id:     id,
 	})
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "数据获取异常", err.Error())
 	} else {
 		response.Json(r, 0, "", rsp.Entity)
 	}
@@ -57,7 +58,8 @@ func (c *Controller) Add(r *ghttp.Request) {
 	var entity *protoMenu.Entity
 
 	if err := r.Parse(&entity); err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "新增异常", err.Error())
+
 	}
 
 	rsp, err := menuService.Add(context.TODO(), &protoMenu.AddReq{
@@ -65,9 +67,9 @@ func (c *Controller) Add(r *ghttp.Request) {
 		Entity: entity,
 	})
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "新增异常", err.Error())
 	} else {
-		response.Json(r, 0, "ok", rsp.Data)
+		response.Json(r, 0, "添加成功", rsp.Data)
 	}
 }
 
@@ -75,7 +77,7 @@ func (c *Controller) UpdateEntityById(r *ghttp.Request) {
 	tenant := r.Header.Get("Tenant")
 	id, err := strconv.ParseInt(r.GetString("id"), 10, 64)
 	if id == 0 || err != nil {
-		response.Json(r, -1, "添加失败！")
+		response.Json(r, 1, "添加失败！")
 		return
 	}
 
@@ -83,20 +85,20 @@ func (c *Controller) UpdateEntityById(r *ghttp.Request) {
 
 	json, err := r.GetJson()
 	if err != nil {
-		response.Json(r, -1, "添加失败！")
+		response.Json(r, 1, "添加失败！")
 	}
 	if err := json.ToStruct(&entity); err != nil {
-		response.Json(r, -1, "添加失败！")
+		response.Json(r, 1, "添加失败！")
 	}
-	rsp, err := menuService.UpdateById(context.TODO(), &protoMenu.UpdateReq{
+	_, err = menuService.UpdateById(context.TODO(), &protoMenu.UpdateReq{
 		Tenant: tenant,
 		Id:     id,
 		Entity: entity,
 	})
-	if rsp.Code == 0 {
+	if err == nil {
 		response.Json(r, 0, "保存成功！")
 	} else {
-		response.Json(r, -1, "保存失败！")
+		response.Json(r, 1, reflect.ValueOf(err).Elem().FieldByName("Detail").String())
 	}
 }
 
@@ -108,7 +110,7 @@ func (c *Controller) GetRoleMenuIds(r *ghttp.Request) {
 		RoleId: roleid,
 	})
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "数据获取异常", err.Error())
 	} else {
 		response.Json(r, 0, "", rsp.Entity)
 	}
@@ -128,7 +130,7 @@ func (c *Controller) DeleteById(r *ghttp.Request) {
 	if rsp.Code == 0 {
 		response.Json(r, 0, "删除成功！")
 	} else {
-		response.Json(r, -1, "删除失败！")
+		response.Json(r, 1, "删除失败！")
 	}
 }
 
@@ -140,8 +142,8 @@ func (c *Controller) GetMenuTree(r *ghttp.Request) {
 	})
 
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, "数据获取异常", err.Error())
 	} else {
-		response.Json(r, 0, "ok", rsp.List)
+		response.Json(r, 0, "", rsp.List)
 	}
 }