hongze 7 months ago
parent
commit
f59d549402
2 changed files with 6 additions and 1 deletions
  1. 5 1
      controllers/base_auth.go
  2. 1 0
      models/system/sys_menu.go

+ 5 - 1
controllers/base_auth.go

@@ -209,8 +209,12 @@ func (c *BaseAuthController) Prepare() {
 			}
 			var api string
 			for _, v := range list {
-				api += v.Api + "&"
+				if v.Api != "" {
+					api += v.Api + "&"
+				}
 			}
+
+			fmt.Println(api)
 			//处理uri请求,去除前缀和参数
 			api = strings.TrimRight(api, "&")
 			uri = strings.Replace(uri, "/adminapi", "", 1)

+ 1 - 0
models/system/sys_menu.go

@@ -200,6 +200,7 @@ func GetMenuListAllByRoleIds(roleIds string) (items []*MenuList, err error) {
 			INNER JOIN sys_role_menu AS b ON a.menu_id=b.menu_id AND b.type = 0
 			INNER JOIN sys_role AS c ON b.role_id=c.role_id
 			WHERE c.role_id in (` + roleIds + `)
+            AND a.menu_type=0
             ORDER BY menu_id ASC `
 	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return