|
@@ -1020,8 +1020,15 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
|
|
|
func System_GetRoleMenuTree(c *entitys.CtrlContext) {
|
|
func System_GetRoleMenuTree(c *entitys.CtrlContext) {
|
|
|
role_id := c.Ctx.Query("role_id")
|
|
role_id := c.Ctx.Query("role_id")
|
|
|
|
|
|
|
|
- op := template.HTML(">=")
|
|
|
|
|
|
|
+ //paramMap := map[string]interface{}{"role_id": role_id}
|
|
|
|
|
+ //sysMenu, err := c.Db.SqlMapClient("get_role_no_have_menu_tree", ¶mMap).Query().List()
|
|
|
|
|
+ //if err != nil {
|
|
|
|
|
+ // c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
|
|
+ // return
|
|
|
|
|
+ //}
|
|
|
|
|
+ //sysTree, err := sysutils.BuildTree("", sysMenu)
|
|
|
|
|
|
|
|
|
|
+ op := template.HTML(">=")
|
|
|
paramMap := map[string]interface{}{"sort": "name", "type": 0, "type_op": op, "hidden": 0}
|
|
paramMap := map[string]interface{}{"sort": "name", "type": 0, "type_op": op, "hidden": 0}
|
|
|
sysTree, err := sysutils.TreeSearch(c.Db, "system", "get_menu_tree", "sys_menu", paramMap)
|
|
sysTree, err := sysutils.TreeSearch(c.Db, "system", "get_menu_tree", "sys_menu", paramMap)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -1031,7 +1038,11 @@ func System_GetRoleMenuTree(c *entitys.CtrlContext) {
|
|
|
|
|
|
|
|
paramMap2 := map[string]interface{}{"role_id": role_id}
|
|
paramMap2 := map[string]interface{}{"role_id": role_id}
|
|
|
//roleTree, err := sysutils.TreeSearch(c.Db, "system", "get_role_menu_tree", "sys_menu", paramMap2)
|
|
//roleTree, err := sysutils.TreeSearch(c.Db, "system", "get_role_menu_tree", "sys_menu", paramMap2)
|
|
|
- roleMenu, _ := c.Db.SqlMapClient("get_role_menu_tree", paramMap2).Query().List()
|
|
|
|
|
|
|
+ roleMenu, err := c.Db.SqlMapClient("get_role_menu_tree", ¶mMap2).Query().List()
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
roleTree, err := sysutils.BuildTree("", roleMenu)
|
|
roleTree, err := sysutils.BuildTree("", roleMenu)
|
|
|
|
|
|
|
@@ -1078,6 +1089,7 @@ func System_AddRoleMenu(c *entitys.CtrlContext) {
|
|
|
roleMenu.MenuId = menu
|
|
roleMenu.MenuId = menu
|
|
|
roleMenu.RoleId = paramObj0.RoleId
|
|
roleMenu.RoleId = paramObj0.RoleId
|
|
|
roleMenu.CreateBy = user.UserId
|
|
roleMenu.CreateBy = user.UserId
|
|
|
|
|
+ roleMenu.CreateTime = sysmodel.NowLocal()
|
|
|
|
|
|
|
|
roleMenus = append(roleMenus, roleMenu)
|
|
roleMenus = append(roleMenus, roleMenu)
|
|
|
}
|
|
}
|