Merge branch 'master' of https://git.qianqiusoft.com/qianqiusoft/light-apiengine

controllers/partial/SystemController.go

@@ -1060,7 +1060,7 @@ func System_TreeList(c *entitys.CtrlContext) {
 		return
 	}
 	nodes, err := sysdb.TreeList(c, user.(*entitys.Token), tbName, parentFiled, parentValue, textFiled, valueFiled, cntparent, domainchk, filter, sord)
-	if err != nil {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nodes})
 	} else {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})

models/Sql_SysMenu.go

@@ -70,6 +70,7 @@ WHERE
 	AND sur.role_id = srm.role_id
 	AND srm.menu_id = sm.id
 	AND sm.del_flag = '0'
+	AND (type = 0 or type = 1)
 ORDER BY
 	sm.order_num;
 `
@@ -81,6 +82,7 @@ FROM
 	sys_menu sm
 WHERE
 	sm.del_flag = '0'
+	AND (type = 0 or type = 1)
 ORDER BY
 	sm.order_num;
 `