Merge branch 'dev' of https://github.com/go-admin-team/go-admin into go-admin-team-dev

This commit is contained in:
zhangwenjian committed 2020-12-21 23:01:37 +08:00
commit 0db2e8ef13
46 files changed
+459 -3627

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ import (
// @Param dictType query string false "dictType"
// @Param pageSize query int false "页条数"
// @Param pageIndex query int false "页码"
// @Success 200 {object} app.PageResponse "{"code": 200, "data": [...]}"
// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
// @Router /api/v1/dict/type/list [get]
// @Security Bearer
func GetDictTypeList(c *gin.Context) {
+6 -3
View File
@@ -53,10 +53,13 @@ func GetMenuTreeRoleselect(c *gin.Context) {
id, err := tools.StringToInt(c.Param("roleId"))
SysRole.RoleId = id
//var r *models.SysRole
r, err := SysRole.Get()
var result *[]models.MenuLable
menuIds := make([]int, 0)
if tools.GetRoleName(c) != "admin" {
result, err = Menu.SetMenuLable()
if r.RoleKey != "admin" {
result, err = Menu.SetMenuLabel()
tools.HasError(err, "抱歉未找到相关信息", -1)
if id != 0 {
menuIds, err = SysRole.GetRoleMeunId()
@@ -81,7 +84,7 @@ func GetMenuTreeRoleselect(c *gin.Context) {
// @Security Bearer
func GetMenuTreeelect(c *gin.Context) {
var data models.Menu
result, err := data.SetMenuLable()
result, err := data.SetMenuLabel()
tools.HasError(err, "抱歉未找到相关信息", -1)
app.OK(c, result, "")
}