修改get_menu_tree

controllers/partial/SystemController.go

@@ -6,6 +6,7 @@ import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	"html/template"
 	"strconv"
 	"time"
 )
@@ -17,18 +18,7 @@ import (
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_Sidebar(c *entitys.CtrlContext) {
-
-	fmt.Println(c.Db.DataSourceName())
-
-	paramMap_i_t := map[string]interface{}{"sort": "name"}
-	result, err := sysutils.TreeSearch(c.Db, "system", "sidebar", "sys_menu", paramMap_i_t)
-
-	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
-	}
-
+	System_GetMenuTree(c)
 }
 
 // _GetMenuTree
@@ -38,7 +28,12 @@ func System_Sidebar(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *entitys.CtrlContext) {
-	paramMap_i_t := map[string]interface{}{"sort": "name"}
+	_type := c.Ctx.DefaultQuery("type", "")
+	type_op := c.Ctx.DefaultQuery("type_op", "")
+
+	op := template.HTML(type_op)
+
+	paramMap_i_t := map[string]interface{}{"sort": "name", "type": _type, "type_op": op}
 	result, err := sysutils.TreeSearch(c.Db, "system", "get_menu_tree", "sys_menu", paramMap_i_t)
 
 	if err == nil {
@@ -385,7 +380,9 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
 	_type := c.Ctx.DefaultQuery("type", "")
 	type_op := c.Ctx.DefaultQuery("type_op", "")
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "type": _type, "type_op": type_op, "name": name, "code": code, "cn_id": cn_id}
+	op := template.HTML(type_op)
+
+	paramMap_i_t := map[string]interface{}{"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})
@@ -557,7 +554,7 @@ func System_DelMenu(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_UpdateMenu(c *entitys.CtrlContext) {
 	var paramObj0 models.SysMenu
-	c.Ctx.BindJSON(&paramObj0)
+	err := c.Ctx.BindJSON(&paramObj0)
 
 	paramMap, err := sysutils.BeanToMap(&paramObj0)
 	_, err = c.Db.SqlMapClient("update_sys_menu", paramMap).Execute()
@@ -827,9 +824,13 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	domain_id := c.Ctx.Query("domain_id")
+	_type := c.Ctx.DefaultQuery("type", "")
+	type_op := c.Ctx.DefaultQuery("type_op", "")
+
+	op := template.HTML(type_op)
 
 	var domain sysmodel.SysDomain
-	param := map[string]interface{}{"id": domain_id}
+	param := map[string]interface{}{"id": domain_id, "type": _type, "type_op": op}
 	_, err := c.Db.SqlMapClient("selectone_sys_domain", &param).Get(&domain)
 	if err != nil {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "not find domain error: " + err.Error(), nil})

sqlconfig/system_controller/system_find_menu_page_count.tpl

@@ -14,3 +14,6 @@ where
 {{if ne .cn_id ""}}
     and inheritance like '%{{.cn_id}}%'
 {{end}}
+{{if ne .type_op ""}}
+    and type {{.type_op }} {{.type}}
+{{end}}

sqlconfig/system_controller/system_find_menu_page_select.tpl

@@ -14,5 +14,8 @@ where
 {{if ne .cn_id ""}}
     and inheritance like '%{{.cn_id}}%'
 {{end}}
+{{if ne .type_op ""}}
+    and type {{.type_op }} {{.type}}
+{{end}}
 order by order_num
-LIMIT {{.rows}} OFFSET {{.offset}}
+LIMIT {{.rows}} OFFSET {{.offset}}

sqlconfig/system_controller/system_get_menu_tree.tpl

@@ -5,4 +5,7 @@ from
     sys_menu
 where
     del_flag = 0
-order by order_num
+{{if ne .type_op ""}}
+    and type {{.type_op }} {{.type}}
+{{end}}
+order by order_num

sqlconfig/system_controller/system_sidebar.tpl

@@ -5,4 +5,7 @@ from
     sys_menu
 where
     del_flag = 0
-order by order_num
+{{if ne .type_op ""}}
+    and type {{.type_op }} {{.type}}
+{{end}}
+order by order_num