|
|
@@ -517,6 +517,7 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
|
|
|
page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
|
|
|
rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
|
|
|
|
|
|
+ user_id := c.Ctx.DefaultQuery("user_id", "")
|
|
|
name := c.Ctx.DefaultQuery("name", "")
|
|
|
code := c.Ctx.DefaultQuery("code", "")
|
|
|
cn_id := c.Ctx.DefaultQuery("cn_id", "")
|
|
|
@@ -526,7 +527,14 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
|
|
|
|
|
|
op := template.HTML(type_op)
|
|
|
|
|
|
- paramMap_i_t := map[string]interface{}{"hidden": hidden, "page": page, "rows": rows, "type": _type, "type_op": op, "name": name, "code": code, "cn_id": cn_id}
|
|
|
+ // 管理员角色ID 5c38ee66-c5e6-40a7-b190-86d115bae3e5
|
|
|
+ exist, _ := c.Db.Table("sys_user_role").Where("user_id = ? and role_id = ?", user_id, "5c38ee66-c5e6-40a7-b190-86d115bae3e5").Exist()
|
|
|
+ //如果是管理员
|
|
|
+ if exist {
|
|
|
+ user_id = ""
|
|
|
+ }
|
|
|
+
|
|
|
+ paramMap_i_t := map[string]interface{}{"user_id": user_id, "hidden": hidden, "page": page, "rows": rows, "type": _type, "type_op": op, "name": name, "code": code, "cn_id": cn_id}
|
|
|
result, err := sysutils.PageSearch(c.Db, "system", "find_menu_page", "sys_menu", paramMap_i_t)
|
|
|
if err == nil {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
|
|
|
@@ -642,7 +650,7 @@ func System_AddMenu(c *entitys.CtrlContext) {
|
|
|
|
|
|
if paramObj0.Parent != "" {
|
|
|
parentNodes := []sysmodel.SysMenu{}
|
|
|
- err := c.Db.SqlMapClient("one_sys_menu", paramObj0.Parent).Find(&parentNodes)
|
|
|
+ err := c.Db.SqlMapClient("select_parent_menu", paramObj0.Parent).Find(&parentNodes)
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
return
|
|
|
@@ -705,7 +713,7 @@ func System_UpdateMenu(c *entitys.CtrlContext) {
|
|
|
|
|
|
if paramObj0.Parent != "" {
|
|
|
parentNodes := []sysmodel.SysMenu{}
|
|
|
- err := c.Db.SqlMapClient("one_sys_menu", paramObj0.Parent).Find(&parentNodes)
|
|
|
+ err := c.Db.SqlMapClient("select_parent_menu", paramObj0.Parent).Find(&parentNodes)
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
return
|