修改get_menu_tree

controllers/gen/SystemController_gen.go

@@ -1,11 +1,10 @@
-
 package gen
 
 import (
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
-	"github.com/gin-gonic/gin"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/partial"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
+	"github.com/gin-gonic/gin"
 )
 
 // SystemController operations for System
@@ -18,420 +17,444 @@ func NewSystemController(e *engine.ApiEngine) *SystemController {
 	return controller
 }
 
-
-
 // Sidebar
 // @Title Sidebar
-// @Description 获取导航菜单         
-// @Param	user    string  false  "用户id"  
+// @Description 获取导航菜单
+// @Param	user    string  false  "用户id"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /sidebar  [post,get]
 func (c *SystemController) Sidebar(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_Sidebar(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindUserPage
 // @Title FindUserPage
-// @Description 获取用户分页数         
+// @Description 获取用户分页数
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_user_page  [get,post]
 func (c *SystemController) FindUserPage(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindUserPage(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetOrgTree
 // @Title GetOrgTree
-// @Description 获取组织架构树         
+// @Description 获取组织架构树
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_org_tree  [get,post]
 func (c *SystemController) GetOrgTree(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetOrgTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetMenuTree
 // @Title GetMenuTree
-// @Description 获取菜单树         
+// @Description 获取菜单树
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_menu_tree  [get,post]
 func (c *SystemController) GetMenuTree(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetMenuTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetDomainTree
 // @Title GetDomainTree
-// @Description 获取菜单树         
+// @Description 获取菜单树
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_domain_tree  [get,post]
 func (c *SystemController) GetDomainTree(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetDomainTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindOrgPage
 // @Title FindOrgPage
-// @Description 获取组织架构分页数         
+// @Description 获取组织架构分页数
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_org_page  [get,post]
 func (c *SystemController) FindOrgPage(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindOrgPage(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindRolePage
 // @Title FindRolePage
-// @Description 获取角色分页数         
+// @Description 获取角色分页数
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_role_page  [get,post]
 func (c *SystemController) FindRolePage(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindRolePage(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindMenuPage
 // @Title FindMenuPage
-// @Description 获取菜单分页数         
+// @Description 获取菜单分页数
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_menu_page  [get,post]
 func (c *SystemController) FindMenuPage(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindMenuPage(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindDomainPage
 // @Title FindDomainPage
-// @Description 获取菜单分页数         
+// @Description 获取菜单分页数
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_domain_page  [get,post]
 func (c *SystemController) FindDomainPage(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindDomainPage(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddUser
 // @Title AddUser
-// @Description 添加用户         
-// @Param	login_id    string  false  "登录ID"  
-// @Param	password    string  false  "密码"  
-// @Param	org_id    string  false  "组织ID"  
-// @Param	email    string  false  "邮箱"  
+// @Description 添加用户
+// @Param	login_id    string  false  "登录ID"
+// @Param	password    string  false  "密码"
+// @Param	org_id    string  false  "组织ID"
+// @Param	email    string  false  "邮箱"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_user  [post,get,put]
 func (c *SystemController) AddUser(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddUser(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelUser
 // @Title DelUser
-// @Description 删除用户         
-// @Param	id    string  false  "用户ID"  
+// @Description 删除用户
+// @Param	id    string  false  "用户ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_user  [post,get,put]
 func (c *SystemController) DelUser(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_DelUser(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateUser
 // @Title UpdateUser
-// @Description 修改用户         
-// @Param	login_id    string  false  "登录ID"  
-// @Param	password    string  false  "密码"  
-// @Param	org_id    string  false  "组织ID"  
-// @Param	email    string  false  "邮箱"  
+// @Description 修改用户
+// @Param	login_id    string  false  "登录ID"
+// @Param	password    string  false  "密码"
+// @Param	org_id    string  false  "组织ID"
+// @Param	email    string  false  "邮箱"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_user  [post,get,put]
 func (c *SystemController) UpdateUser(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_UpdateUser(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetUser
 // @Title GetUser
-// @Description 更加用户ID获取用户信息         
-// @Param	user_id    string  false  "用户ID"  
+// @Description 更加用户ID获取用户信息
+// @Param	user_id    string  false  "用户ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_user  [get]
 func (c *SystemController) GetUser(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetUser(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddRole
 // @Title AddRole
-// @Description 添加角色         
-// @Param	name    string  false  "角色名称"  
-// @Param	remark    string  false  "备注"  
+// @Description 添加角色
+// @Param	name    string  false  "角色名称"
+// @Param	remark    string  false  "备注"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_role  [post,get,put]
 func (c *SystemController) AddRole(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddRole(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelRole
 // @Title DelRole
-// @Description 添加角色         
-// @Param	id    string  false  "角色ID"  
+// @Description 添加角色
+// @Param	id    string  false  "角色ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_role  [post,get,put]
 func (c *SystemController) DelRole(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_DelRole(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateRole
 // @Title UpdateRole
-// @Description 修改角色         
-// @Param	id    string  false  "角色ID"  
-// @Param	name    string  false  "角色名称"  
-// @Param	remark    string  false  "备注"  
+// @Description 修改角色
+// @Param	id    string  false  "角色ID"
+// @Param	name    string  false  "角色名称"
+// @Param	remark    string  false  "备注"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_role  [post,get,put]
 func (c *SystemController) UpdateRole(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_UpdateRole(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindRoleMenu
 // @Title FindRoleMenu
-// @Description 查找角色权限         
-// @Param	role_id    string  false  "角色id"  
+// @Description 查找角色权限
+// @Param	role_id    string  false  "角色id"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_role_menu  [post,get,put]
 func (c *SystemController) FindRoleMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindRoleMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // SaveRoleMenu
 // @Title SaveRoleMenu
-// @Description 保存角色权限         
-// @Param	role_menu    string  false  "角色权限"  
+// @Description 保存角色权限
+// @Param	role_menu    string  false  "角色权限"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /save_role_menu  [post,get,put]
 func (c *SystemController) SaveRoleMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_SaveRoleMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // RoleAll
 // @Title RoleAll
-// @Description 查找所有角色         
+// @Description 查找所有角色
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /role_all  [post,get,put]
 func (c *SystemController) RoleAll(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_RoleAll(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindPermissions
 // @Title FindPermissions
-// @Description 查找用户权限         
+// @Description 查找用户权限
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_permissions  [post,get,put]
 func (c *SystemController) FindPermissions(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_FindPermissions(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddMenu
 // @Title AddMenu
-// @Description 添加菜单         
-// @Param	    string  false  "菜单"  
+// @Description 添加菜单
+// @Param	    string  false  "菜单"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_menu  [post,get,put]
 func (c *SystemController) AddMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelMenu
 // @Title DelMenu
-// @Description 删除菜单         
-// @Param	id    string  false  "菜单ID"  
+// @Description 删除菜单
+// @Param	id    string  false  "菜单ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_menu  [post,get,put]
 func (c *SystemController) DelMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_DelMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateMenu
 // @Title UpdateMenu
-// @Description 更新菜单         
-// @Param	    string  false  "菜单"  
+// @Description 更新菜单
+// @Param	    string  false  "菜单"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_menu  [post,get,put]
 func (c *SystemController) UpdateMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_UpdateMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddOrg
 // @Title AddOrg
-// @Description 添加组织         
-// @Param	    string  false  "组织"  
+// @Description 添加组织
+// @Param	    string  false  "组织"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_org  [post,get,put]
 func (c *SystemController) AddOrg(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddOrg(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelOrg
 // @Title DelOrg
-// @Description 删除组织         
-// @Param	id    string  false  "组织ID"  
+// @Description 删除组织
+// @Param	id    string  false  "组织ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_org  [post,get,put]
 func (c *SystemController) DelOrg(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_DelOrg(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateOrg
 // @Title UpdateOrg
-// @Description 更新组织         
-// @Param	    string  false  "组织"  
+// @Description 更新组织
+// @Param	    string  false  "组织"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_org  [post,get,put]
 func (c *SystemController) UpdateOrg(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_UpdateOrg(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetOrgByUserid
 // @Title GetOrgByUserid
-// @Description 根据用户id获取用户组织         
-// @Param	user_id    string  false  "用户id"  
+// @Description 根据用户id获取用户组织
+// @Param	user_id    string  false  "用户id"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_org_by_userid  [post,get]
 func (c *SystemController) GetOrgByUserid(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetOrgByUserid(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddDomain
 // @Title AddDomain
-// @Description 添加域         
-// @Param	      false  "域"  
+// @Description 添加域
+// @Param	      false  "域"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_domain  [post,get,put]
 func (c *SystemController) AddDomain(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddDomain(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelDomain
 // @Title DelDomain
-// @Description 删除域         
-// @Param	id    string  false  "域ID"  
+// @Description 删除域
+// @Param	id    string  false  "域ID"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_domain  [post,get,put]
 func (c *SystemController) DelDomain(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_DelDomain(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateDomain
 // @Title UpdateDomain
-// @Description 修改域         
-// @Param	      false  "域"  
+// @Description 修改域
+// @Param	      false  "域"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_domain  [post,get,put]
 func (c *SystemController) UpdateDomain(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_UpdateDomain(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddDomainMenu
 // @Title AddDomainMenu
-// @Description 域添加菜单         
-// @Param	      false  "添加域菜单bean"  
+// @Description 域添加菜单
+// @Param	      false  "添加域菜单bean"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_domain_menu  [post,get,put]
 func (c *SystemController) AddDomainMenu(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_AddDomainMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetDomainMenuTree
 // @Title GetDomainMenuTree
-// @Description 域添加菜单         
-// @Param	domain_id    string  false  "域id"  
+// @Description 域添加菜单
+// @Param	domain_id    string  false  "域id"
 // @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_domain_menu_tree  [get,put]
 func (c *SystemController) GetDomainMenuTree(ctx *gin.Context) {
 	//
-	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
 	partial.System_GetDomainMenuTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
+// GetRoleMenuTree
+// @Title GetRoleMenuTree
+// @Description 获取角色权限菜单
+// @Param	role_id    string  false  "角色id"
+// @Success 200 {object} sysReturn
+// @Failure 403 :id is empty
+// @router /get_role_menu_tree  [get]
+func (c *SystemController) GetRoleMenuTree(ctx *gin.Context) {
+	//
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	partial.System_GetRoleMenuTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
+}
+
+// AddRoleMenu
+// @Title AddRoleMenu
+// @Description 添加角色菜单
+// @Param	menu_id      false  "菜单id"
+// @Param	role_id    string  false  "角色id"
+// @Success 200 {object} sysReturn
+// @Failure 403 :id is empty
+// @router /add_role_menu  [post]
+func (c *SystemController) AddRoleMenu(ctx *gin.Context) {
+	//
+	db := c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	partial.System_AddRoleMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
+}

controllers/partial/SystemController.go

@@ -188,7 +188,7 @@ func System_AddUser(c *entitys.CtrlContext) {
 	user_id := c.Ctx.GetString("user_id")
 	user.Id = sysutils.NewUUID()
 	user.Name = user.LoginId
-	user.CreateTime = time.Now()
+	user.CreateTime = models.NowLocal()
 	user.LastUpdateTime = time.Now().UnixNano()
 	user.CreateBy = user_id
 	user.LastUpdateBy = user_id
@@ -281,11 +281,11 @@ func System_GetUser(c *entitys.CtrlContext) {
 	user_id := c.Ctx.Query("user_id")
 
 	var user sysmodel.SysUser
-	err := c.Db.SqlMapClient("selectone_sys_user",map[string]interface{}{"id": user_id}).Find(&user)
+	err := c.Db.SqlMapClient("selectone_sys_user", map[string]interface{}{"id": user_id}).Find(&user)
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", user})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
@@ -307,7 +307,7 @@ func System_AddRole(c *entitys.CtrlContext) {
 	paramObj0.Id = sysutils.NewUUID()
 	paramObj0.CreateBy = user.UserId
 	paramObj0.LastUpdateBy = user.UserId
-	paramObj0.CreateTime = time.Now()
+	paramObj0.CreateTime = models.NowLocal()
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
 	paramObj0.DelFlag = 0
 
@@ -358,15 +358,21 @@ func System_DelRole(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateRole(c *entitys.CtrlContext) {
-	id := c.Ctx.Query("id")
-	name := c.Ctx.Query("name")
-	remark := c.Ctx.Query("remark")
+	var role sysmodel.SysRole
+	err := c.Ctx.BindJSON(&role)
 
-	ret := __none_func_system__(id, name, remark)
-	if ret {
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	paramMap, _ := sysutils.BeanToMap(&role)
+	_, err = c.Db.SqlMapClient("update_sys_role", paramMap).Execute()
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -380,7 +386,10 @@ func System_FindRolePage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	name := c.Ctx.DefaultQuery("name", "")
+	code := c.Ctx.DefaultQuery("code", "")
+
+	paramMap_i_t := map[string]interface{}{"name": name, "code": code, "page": page, "rows": rows}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_role_page", "sys_role", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -403,10 +412,11 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
 	cn_id := c.Ctx.DefaultQuery("cn_id", "")
 	_type := c.Ctx.DefaultQuery("type", "")
 	type_op := c.Ctx.DefaultQuery("type_op", "")
+	hidden := c.Ctx.DefaultQuery("hidden", "")
 
 	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}
+	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}
 	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})
@@ -660,13 +670,22 @@ func System_AddOrg(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelOrg(c *entitys.CtrlContext) {
-	id := c.Ctx.Query("id")
+	type Param struct {
+		Id string `json:"id"`
+	}
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
+	}
 
-	ret := __none_func_system__(id)
-	if ret {
+	_, err := c.Db.Table(new(models.SysOrg)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -682,13 +701,13 @@ func System_UpdateOrg(c *entitys.CtrlContext) {
 	//name := c.Ctx.Query("name")
 	//domain := c.Ctx.Query("domain")
 	//parent := c.Ctx.Query("parent")
-	
+
 	var paramObj0 models.SysOrg
 	err := c.Ctx.BindJSON(&paramObj0)
-	
+
 	tk, _ := c.Ctx.Get("token")
 	user := tk.(*entitys.Token)
-	
+
 	if paramObj0.Parent != "" {
 		parentNodes := []sysmodel.SysOrg{}
 		err := c.Db.SqlMapClient("one_sys_org", paramObj0.Parent).Find(&parentNodes)
@@ -700,13 +719,13 @@ func System_UpdateOrg(c *entitys.CtrlContext) {
 	} else {
 		paramObj0.Inheritance = fmt.Sprintf("|%s|", paramObj0.Id)
 	}
-	
+
 	paramObj0.LastUpdateBy = user.UserId
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
-	
+
 	paramMap, err := sysutils.BeanToMap(&paramObj0)
 	_, err = c.Db.SqlMapClient("update_sys_org", paramMap).Execute()
-	
+
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -858,20 +877,19 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 	var paramObj0 struct {
 
 		//域名ID
-		DomainId   string `json:"domain_id"`
+		DomainId string `json:"domain_id"`
 		//菜单
-		Menus   []struct{
-			Id string `json:"id"`
+		Menus []struct {
+			Id   string `json:"id"`
 			Name string `json:"name"`
 		} `json:"menus"`
-
 	}
 	err := c.Ctx.BindJSON(&paramObj0)
-	if err != nil{
+	if err != nil {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "BindJSON error: " + err.Error(), nil})
 		return
 	}
-	if len(paramObj0.Menus) <= 0{
+	if len(paramObj0.Menus) <= 0 {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "the menus is empty", nil})
 		return
 	}
@@ -885,7 +903,7 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 	}
 
 	var menuIds = make([]string, len(paramObj0.Menus))
-	for i := range paramObj0.Menus{
+	for i := range paramObj0.Menus {
 		menuIds[i] = paramObj0.Menus[i].Id
 	}
 	var menus []sysmodel.SysMenu
@@ -894,9 +912,9 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "find menu error: " + err.Error(), nil})
 		return
 	}
-	for i := range menus{
-		for j := range paramObj0.Menus{
-			if menus[i].Id == paramObj0.Menus[j].Id{
+	for i := range menus {
+		for j := range paramObj0.Menus {
+			if menus[i].Id == paramObj0.Menus[j].Id {
 				menus[i].Name = paramObj0.Menus[j].Name
 				break
 			}
@@ -965,8 +983,8 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	}
 
 	var sysMenusMap map[string]map[string]interface{}
-	sysMenusMap = make(map[string]map[string]interface{},0)
-	for _, menu := range sysMenus{
+	sysMenusMap = make(map[string]map[string]interface{}, 0)
+	for _, menu := range sysMenus {
 		sysMenusMap[menu["id"].(string)] = menu
 	}
 
@@ -976,7 +994,7 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	}
 
 	var sysMenuRest []map[string]interface{}
-	for _, menu := range sysMenusMap{
+	for _, menu := range sysMenusMap {
 		sysMenuRest = append(sysMenuRest, menu)
 	}
 
@@ -990,6 +1008,93 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	}
 }
 
+// _GetUserMenuTree
+// @Title _GetUserMenuTree
+// @Description 获取用户权限菜单
+// @Param	user_id    string  false  "用户id"
+// @Success 200 {object} Account
+// @Failure 403 :id is empty
+func System_GetRoleMenuTree(c *entitys.CtrlContext) {
+	role_id := c.Ctx.Query("role_id")
+
+	op := template.HTML(">=")
+
+	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)
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	paramMap2 := map[string]interface{}{"role_id": role_id}
+	//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()
+
+	roleTree, err := sysutils.BuildTree("", roleMenu)
+
+	ret := __none_func_system__(role_id)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", map[string]interface{}{"sys_tree": sysTree, "role_tree": roleTree}})
+	} else {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _AddRoleMenu
+// @Title _AddRoleMenu
+// @Description 添加角色菜单
+// @Param	menu_id      false  "菜单id"
+// @Param	role_id    string  false  "角色id"
+// @Success 200 {object} Account
+// @Failure 403 :id is empty
+func System_AddRoleMenu(c *entitys.CtrlContext) {
+	tk, _ := c.Ctx.Get("token")
+	user := tk.(*entitys.Token)
+
+	var paramObj0 struct {
+		MenuIds []string `json:"menu_ids"`
+		RoleId  string   `json:"role_id"`
+	}
+
+	c.Ctx.BindJSON(&paramObj0)
+
+	session := c.Db.NewSession()
+	defer session.Close()
+	session.Begin()
+	_, err := session.SqlMapClient("del_role_menu", paramObj0.RoleId).Execute()
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	var roleMenus []*sysmodel.SysRoleMenu
+	for _, menu := range paramObj0.MenuIds {
+		roleMenu := &sysmodel.SysRoleMenu{}
+		roleMenu.Id = sysutils.NewUUID()
+		roleMenu.MenuId = menu
+		roleMenu.RoleId = paramObj0.RoleId
+		roleMenu.CreateBy = user.UserId
+
+		roleMenus = append(roleMenus, roleMenu)
+	}
+
+	_, err = session.InsertMulti(&roleMenus)
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	session.Commit()
+	ret := __none_func_system__(paramObj0)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
 func __none_func_system__(params ...interface{}) bool {
 	return true
 }

engine/system_init.go

@@ -60,7 +60,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Domain:         "qianqiuiot.com",
 			OrgId:          "287c50a4-caad-4557-80c8-aca81af9f370",
 			Password:       utils.HashPassword("123456", ""),
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}
@@ -69,7 +69,7 @@ func initPlatformDbData(db *xorm.Engine) {
 		{
 			Id:             "487c50a4-caad-4557-80c8-aca81af9f370",
 			Name:           "超级管理员",
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}
@@ -90,7 +90,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Name:           "系统管理",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 10000,
+			OrderNum:       10000,
 		},
 		{
 			Id:             "64994cad-559f-445e-b1be-3009c9a4e850",
@@ -100,7 +100,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/domain",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1001,
+			OrderNum:       1001,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f374",
@@ -110,7 +110,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/menu",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1002,
+			OrderNum:       1002,
 		},
 		{
 			Id:             "f9928388-7861-4551-9273-e74858962ff8",
@@ -120,7 +120,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/app_menu",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1003,
+			OrderNum:       1003,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f371",
@@ -130,7 +130,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/user",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1004,
+			OrderNum:       1004,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f372",
@@ -140,7 +140,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/org",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1005,
+			OrderNum:       1005,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f373",
@@ -150,7 +150,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/role",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1006,
+			OrderNum:       1006,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f375",
@@ -160,7 +160,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/dic",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1007,
+			OrderNum:       1007,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f376",
@@ -170,7 +170,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/log",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1008,
+			OrderNum:       1008,
 		},
 	}
 
@@ -221,21 +221,21 @@ func initOrmEngine(orm *xorm.Engine, driverName string) {
 	createDatabase(orm)
 }
 
-func initBusinessDbData(domainid, login_id, domain string, db *xorm.Engine,platform_db *xorm.Engine) {
+func initBusinessDbData(domainid, login_id, domain string, db *xorm.Engine, platform_db *xorm.Engine) {
 	users := models.SysUser{
 		Id:         domainid,
 		Name:       "管理员",
 		LoginId:    login_id,
 		Domain:     domain,
 		Password:   utils.HashPassword("123456", ""),
-		CreateTime: time.Now(),
+		CreateTime: models.NowLocal(),
 	}
 
 	roles := []models.SysRole{
 		{
 			Id:         domainid,
 			Name:       "管理员",
-			CreateTime: time.Now(),
+			CreateTime: models.NowLocal(),
 		},
 	}
 

light-apiengine.xml

@@ -243,6 +243,21 @@
                     <failure ref="$sys_return"></failure>
                 </return>
             </api>
+            <api name="get_role_menu_tree" desc="获取角色权限菜单" method="get">
+                <param name="role_id"  type="string" desc="角色id"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
+            <api name="add_role_menu" desc="添加角色菜单" method="post">
+                <param name="menu_id"  ref="string array" desc="菜单id"/>
+                <param name="role_id"  type="string" desc="角色id"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
         </controller>
         <controller name="api" desc="api接口">
             <api name="api_doc" method="get" desc="api文档">
@@ -335,7 +350,7 @@
             <column isNull="false" name="avatar" caption="头像" type="string" size="255" dbtype="varchar(255)"/>
             <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>
@@ -373,7 +388,7 @@
             <column name="status" caption="状态 0：禁用   1：正常" type="int32"/>
             <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>

models/LoginReturnInfo_gen.go

@@ -1,14 +1,11 @@
-
 package models
+
 import (
-"time"
 //__import_packages__
 )
 
-
-
 type LoginReturnInfo struct {
-		//主键
+	//主键
 	Id string `json:"id"`
 	//登录ID
 	LoginId string `json:"login_id"`
@@ -24,7 +21,7 @@ type LoginReturnInfo struct {
 	Email string `json:"email"`
 	//组织ID
 	OrgId string `json:"org_id"`
-	//性别 0：女    1：男 
+	//性别 0：女    1：男
 	Gender int32 `json:"gender"`
 	//用户类型
 	Type int32 `json:"type"`
@@ -37,7 +34,7 @@ type LoginReturnInfo struct {
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间
-	CreateTime time.Time `json:"create_time"`
+	CreateTime LocalTime `json:"create_time"`
 	//最后更新人
 	LastUpdateBy string `json:"last_update_by"`
 	//最后更新时间
@@ -46,10 +43,9 @@ type LoginReturnInfo struct {
 	DelFlag int32 `json:"del_flag"`
 
 	//token
-	Token   string `json:"token"`
-
+	Token string `json:"token"`
 }
 
 func init() {
-    AddTableName("login_return_info")
+	AddTableName("login_return_info")
 }

models/SysRole_gen.go

@@ -1,34 +1,32 @@
-
 package models
+
 import (
-	"time"
 //__import_packages__
 )
 
 type SysRole struct {
 	//主键
-	Id   string    `xorm:"'id' varchar(36) pk notnull "json:"id"`
+	Id string `xorm:"'id' varchar(36) pk notnull "json:"id"`
 	//名称
-	Name   string    `xorm:"'name' varchar(36) notnull "json:"name"`
+	Name string `xorm:"'name' varchar(36) notnull "json:"name"`
 	//编码
-	Code   string    `xorm:"'code' varchar(36) notnull "json:"code"`
+	Code string `xorm:"'code' varchar(36) notnull "json:"code"`
 	//备注
-	Remark   string    `xorm:"'remark' varchar(100) notnull "json:"remark"`
+	Remark string `xorm:"'remark' varchar(100) notnull "json:"remark"`
 	//状态 0：禁用   1：正常
-	Status   int32    `xorm:"'status' notnull "json:"status"`
+	Status int32 `xorm:"'status' notnull "json:"status"`
 	//域
-	Domain   string    `xorm:"'domain' varchar(50) notnull "json:"domain"`
+	Domain string `xorm:"'domain' varchar(50) notnull "json:"domain"`
 	//创建人
-	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
+	CreateBy string `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
+	CreateTime LocalTime `xorm:"'create_time' notnull "json:"create_time"`
 	//最后更新人
-	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
+	LastUpdateBy string `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
 	//最后更新时间
-	LastUpdateTime   int64    `xorm:"'last_update_time' notnull "json:"last_update_time"`
+	LastUpdateTime int64 `xorm:"'last_update_time' notnull "json:"last_update_time"`
 	//是否删除 1：删除   0：正常
-	DelFlag   int32    `xorm:"'del_flag' notnull "json:"del_flag"`
-
+	DelFlag int32 `xorm:"'del_flag' notnull "json:"del_flag"`
 }
 
 func (t *SysRole) TableName() string {
@@ -36,6 +34,6 @@ func (t *SysRole) TableName() string {
 }
 
 func init() {
-    AddTableName("sys_role")
+	AddTableName("sys_role")
 	RegisterModel(new(SysRole))
 }

models/SysUser_gen.go

@@ -1,48 +1,46 @@
-
 package models
+
 import (
-	"time"
 //__import_packages__
 )
 
 type SysUser struct {
 	//主键
-	Id   string    `xorm:"'id' varchar(36) pk notnull "json:"id"`
+	Id string `xorm:"'id' varchar(36) pk notnull "json:"id"`
 	//登录ID
-	LoginId   string    `xorm:"'login_id' varchar(36) notnull "json:"login_id"`
+	LoginId string `xorm:"'login_id' varchar(36) notnull "json:"login_id"`
 	//密码
-	Password   string    `xorm:"'password' varchar(36) notnull "json:"password"`
+	Password string `xorm:"'password' varchar(36) notnull "json:"password"`
 	//名字
-	Name   string    `xorm:"'name' varchar(36) notnull "json:"name"`
+	Name string `xorm:"'name' varchar(36) notnull "json:"name"`
 	//全名
-	FullName   string    `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
+	FullName string `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
 	//电话
-	Mobile   string    `xorm:"'mobile' varchar(50) notnull "json:"mobile"`
+	Mobile string `xorm:"'mobile' varchar(50) notnull "json:"mobile"`
 	//邮箱
-	Email   string    `xorm:"'email' varchar(50) notnull "json:"email"`
+	Email string `xorm:"'email' varchar(50) notnull "json:"email"`
 	//组织ID
-	OrgId   string    `xorm:"'org_id' varchar(36) notnull "json:"org_id"`
-	//性别 0：女    1：男 
-	Gender   int32    `xorm:"'gender' notnull "json:"gender"`
+	OrgId string `xorm:"'org_id' varchar(36) notnull "json:"org_id"`
+	//性别 0：女    1：男
+	Gender int32 `xorm:"'gender' notnull "json:"gender"`
 	//用户类型
-	Type   int32    `xorm:"'type' notnull "json:"type"`
+	Type int32 `xorm:"'type' notnull "json:"type"`
 	//状态 0：禁用   1：正常
-	Status   int32    `xorm:"'status' notnull "json:"status"`
+	Status int32 `xorm:"'status' notnull "json:"status"`
 	//头像
-	Avatar   string    `xorm:"'avatar' varchar(255) notnull "json:"avatar"`
+	Avatar string `xorm:"'avatar' varchar(255) notnull "json:"avatar"`
 	//域
-	Domain   string    `xorm:"'domain' varchar(50) notnull "json:"domain"`
+	Domain string `xorm:"'domain' varchar(50) notnull "json:"domain"`
 	//创建人
-	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
+	CreateBy string `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
+	CreateTime LocalTime `xorm:"'create_time' notnull "json:"create_time"`
 	//最后更新人
-	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
+	LastUpdateBy string `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
 	//最后更新时间
-	LastUpdateTime   int64    `xorm:"'last_update_time' notnull "json:"last_update_time"`
+	LastUpdateTime int64 `xorm:"'last_update_time' notnull "json:"last_update_time"`
 	//是否删除 1：删除   0：正常
-	DelFlag   int32    `xorm:"'del_flag' notnull "json:"del_flag"`
-
+	DelFlag int32 `xorm:"'del_flag' notnull "json:"del_flag"`
 }
 
 func (t *SysUser) TableName() string {
@@ -50,6 +48,6 @@ func (t *SysUser) TableName() string {
 }
 
 func init() {
-    AddTableName("sys_user")
+	AddTableName("sys_user")
 	RegisterModel(new(SysUser))
 }

models/UserInfo_gen.go

@@ -1,14 +1,11 @@
-
 package models
+
 import (
-"time"
 //__import_packages__
 )
 
-
-
 type UserInfo struct {
-		//主键
+	//主键
 	Id string `json:"id"`
 	//登录ID
 	LoginId string `json:"login_id"`
@@ -24,7 +21,7 @@ type UserInfo struct {
 	Email string `json:"email"`
 	//组织ID
 	OrgId string `json:"org_id"`
-	//性别 0：女    1：男 
+	//性别 0：女    1：男
 	Gender int32 `json:"gender"`
 	//用户类型
 	Type int32 `json:"type"`
@@ -37,7 +34,7 @@ type UserInfo struct {
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间
-	CreateTime time.Time `json:"create_time"`
+	CreateTime LocalTime `json:"create_time"`
 	//最后更新人
 	LastUpdateBy string `json:"last_update_by"`
 	//最后更新时间
@@ -46,14 +43,13 @@ type UserInfo struct {
 	DelFlag int32 `json:"del_flag"`
 
 	//部门名称
-	OrgName   string `json:"org_name"`
+	OrgName string `json:"org_name"`
 	//角色名称
-	RoleName   string `json:"role_name"`
+	RoleName string `json:"role_name"`
 	//用户角色
-	UserRole   []SysUserRole `json:"user_role"`
-
+	UserRole []SysUserRole `json:"user_role"`
 }
 
 func init() {
-    AddTableName("user_info")
+	AddTableName("user_info")
 }

routers/system_gen.go

@@ -1,121 +1,123 @@
-
 package routers
 
 import (
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 )
 
-func init(){
+func init() {
 	addRegisterHandler(registerSystemRouter)
 }
 
-func registerSystemRouter(e *engine.ApiEngine){
-	api:=e.GinEngine.Group("/api")
-	v1:=api.Group("/v1/system")
-    _router["system"] = v1
+func registerSystemRouter(e *engine.ApiEngine) {
+	api := e.GinEngine.Group("/api")
+	v1 := api.Group("/v1/system")
+	_router["system"] = v1
 	v1.Use(middleware.LoginWare())
 
 	ctrler := gen.NewSystemController(e)
 
+	v1.GET("/sidebar", ctrler.Sidebar)
+	v1.POST("/sidebar", ctrler.Sidebar)
 
+	v1.GET("/find_user_page", ctrler.FindUserPage)
+	v1.POST("/find_user_page", ctrler.FindUserPage)
 
-	v1.GET("/sidebar",ctrler.Sidebar)
-	v1.POST("/sidebar",ctrler.Sidebar)
-
-	v1.GET("/find_user_page",ctrler.FindUserPage)
-	v1.POST("/find_user_page",ctrler.FindUserPage)
+	v1.GET("/get_org_tree", ctrler.GetOrgTree)
+	v1.POST("/get_org_tree", ctrler.GetOrgTree)
 
-	v1.GET("/get_org_tree",ctrler.GetOrgTree)
-	v1.POST("/get_org_tree",ctrler.GetOrgTree)
+	v1.GET("/get_menu_tree", ctrler.GetMenuTree)
+	v1.POST("/get_menu_tree", ctrler.GetMenuTree)
 
-	v1.GET("/get_menu_tree",ctrler.GetMenuTree)
-	v1.POST("/get_menu_tree",ctrler.GetMenuTree)
+	v1.GET("/get_domain_tree", ctrler.GetDomainTree)
+	v1.POST("/get_domain_tree", ctrler.GetDomainTree)
 
-	v1.GET("/get_domain_tree",ctrler.GetDomainTree)
-	v1.POST("/get_domain_tree",ctrler.GetDomainTree)
+	v1.GET("/find_org_page", ctrler.FindOrgPage)
+	v1.POST("/find_org_page", ctrler.FindOrgPage)
 
-	v1.GET("/find_org_page",ctrler.FindOrgPage)
-	v1.POST("/find_org_page",ctrler.FindOrgPage)
+	v1.GET("/find_role_page", ctrler.FindRolePage)
+	v1.POST("/find_role_page", ctrler.FindRolePage)
 
-	v1.GET("/find_role_page",ctrler.FindRolePage)
-	v1.POST("/find_role_page",ctrler.FindRolePage)
+	v1.GET("/find_menu_page", ctrler.FindMenuPage)
+	v1.POST("/find_menu_page", ctrler.FindMenuPage)
 
-	v1.GET("/find_menu_page",ctrler.FindMenuPage)
-	v1.POST("/find_menu_page",ctrler.FindMenuPage)
+	v1.GET("/find_domain_page", ctrler.FindDomainPage)
+	v1.POST("/find_domain_page", ctrler.FindDomainPage)
 
-	v1.GET("/find_domain_page",ctrler.FindDomainPage)
-	v1.POST("/find_domain_page",ctrler.FindDomainPage)
+	v1.GET("/add_user", ctrler.AddUser)
+	v1.POST("/add_user", ctrler.AddUser)
 
-	v1.GET("/add_user",ctrler.AddUser)
-	v1.POST("/add_user",ctrler.AddUser)
+	v1.GET("/del_user", ctrler.DelUser)
+	v1.POST("/del_user", ctrler.DelUser)
 
-	v1.GET("/del_user",ctrler.DelUser)
-	v1.POST("/del_user",ctrler.DelUser)
+	v1.GET("/update_user", ctrler.UpdateUser)
+	v1.POST("/update_user", ctrler.UpdateUser)
 
-	v1.GET("/update_user",ctrler.UpdateUser)
-	v1.POST("/update_user",ctrler.UpdateUser)
-
-	v1.GET("/get_user",ctrler.GetUser)
+	v1.GET("/get_user", ctrler.GetUser)
 	//v1.POST("/get_user",ctrler.GetUser)
 
-	v1.GET("/add_role",ctrler.AddRole)
-	v1.POST("/add_role",ctrler.AddRole)
+	v1.GET("/add_role", ctrler.AddRole)
+	v1.POST("/add_role", ctrler.AddRole)
 
-	v1.GET("/del_role",ctrler.DelRole)
-	v1.POST("/del_role",ctrler.DelRole)
+	v1.GET("/del_role", ctrler.DelRole)
+	v1.POST("/del_role", ctrler.DelRole)
 
-	v1.GET("/update_role",ctrler.UpdateRole)
-	v1.POST("/update_role",ctrler.UpdateRole)
+	v1.GET("/update_role", ctrler.UpdateRole)
+	v1.POST("/update_role", ctrler.UpdateRole)
 
-	v1.GET("/find_role_menu",ctrler.FindRoleMenu)
-	v1.POST("/find_role_menu",ctrler.FindRoleMenu)
+	v1.GET("/find_role_menu", ctrler.FindRoleMenu)
+	v1.POST("/find_role_menu", ctrler.FindRoleMenu)
 
-	v1.GET("/save_role_menu",ctrler.SaveRoleMenu)
-	v1.POST("/save_role_menu",ctrler.SaveRoleMenu)
+	v1.GET("/save_role_menu", ctrler.SaveRoleMenu)
+	v1.POST("/save_role_menu", ctrler.SaveRoleMenu)
 
-	v1.GET("/role_all",ctrler.RoleAll)
-	v1.POST("/role_all",ctrler.RoleAll)
+	v1.GET("/role_all", ctrler.RoleAll)
+	v1.POST("/role_all", ctrler.RoleAll)
 
-	v1.GET("/find_permissions",ctrler.FindPermissions)
-	v1.POST("/find_permissions",ctrler.FindPermissions)
+	v1.GET("/find_permissions", ctrler.FindPermissions)
+	v1.POST("/find_permissions", ctrler.FindPermissions)
 
-	v1.GET("/add_menu",ctrler.AddMenu)
-	v1.POST("/add_menu",ctrler.AddMenu)
+	v1.GET("/add_menu", ctrler.AddMenu)
+	v1.POST("/add_menu", ctrler.AddMenu)
 
-	v1.GET("/del_menu",ctrler.DelMenu)
-	v1.POST("/del_menu",ctrler.DelMenu)
+	v1.GET("/del_menu", ctrler.DelMenu)
+	v1.POST("/del_menu", ctrler.DelMenu)
 
-	v1.GET("/update_menu",ctrler.UpdateMenu)
-	v1.POST("/update_menu",ctrler.UpdateMenu)
+	v1.GET("/update_menu", ctrler.UpdateMenu)
+	v1.POST("/update_menu", ctrler.UpdateMenu)
 
-	v1.GET("/add_org",ctrler.AddOrg)
-	v1.POST("/add_org",ctrler.AddOrg)
+	v1.GET("/add_org", ctrler.AddOrg)
+	v1.POST("/add_org", ctrler.AddOrg)
 
-	v1.GET("/del_org",ctrler.DelOrg)
-	v1.POST("/del_org",ctrler.DelOrg)
+	v1.GET("/del_org", ctrler.DelOrg)
+	v1.POST("/del_org", ctrler.DelOrg)
 
-	v1.GET("/update_org",ctrler.UpdateOrg)
-	v1.POST("/update_org",ctrler.UpdateOrg)
+	v1.GET("/update_org", ctrler.UpdateOrg)
+	v1.POST("/update_org", ctrler.UpdateOrg)
 
-	v1.GET("/get_org_by_userid",ctrler.GetOrgByUserid)
-	v1.POST("/get_org_by_userid",ctrler.GetOrgByUserid)
+	v1.GET("/get_org_by_userid", ctrler.GetOrgByUserid)
+	v1.POST("/get_org_by_userid", ctrler.GetOrgByUserid)
 
-	v1.GET("/add_domain",ctrler.AddDomain)
-	v1.POST("/add_domain",ctrler.AddDomain)
+	v1.GET("/add_domain", ctrler.AddDomain)
+	v1.POST("/add_domain", ctrler.AddDomain)
 
-	v1.GET("/del_domain",ctrler.DelDomain)
-	v1.POST("/del_domain",ctrler.DelDomain)
+	v1.GET("/del_domain", ctrler.DelDomain)
+	v1.POST("/del_domain", ctrler.DelDomain)
 
-	v1.GET("/update_domain",ctrler.UpdateDomain)
-	v1.POST("/update_domain",ctrler.UpdateDomain)
+	v1.GET("/update_domain", ctrler.UpdateDomain)
+	v1.POST("/update_domain", ctrler.UpdateDomain)
 
-	v1.GET("/add_domain_menu",ctrler.AddDomainMenu)
-	v1.POST("/add_domain_menu",ctrler.AddDomainMenu)
+	v1.GET("/add_domain_menu", ctrler.AddDomainMenu)
+	v1.POST("/add_domain_menu", ctrler.AddDomainMenu)
 
-	v1.GET("/get_domain_menu_tree",ctrler.GetDomainMenuTree)
+	v1.GET("/get_domain_menu_tree", ctrler.GetDomainMenuTree)
 	//v1.POST("/get_domain_menu_tree",ctrler.GetDomainMenuTree)
 
-}
+	v1.GET("/get_role_menu_tree", ctrler.GetRoleMenuTree)
+	//v1.POST("/get_role_menu_tree",ctrler.GetRoleMenuTree)
 
+	//v1.GET("/add_role_menu",ctrler.AddRoleMenu)
+	v1.POST("/add_role_menu", ctrler.AddRoleMenu)
+
+}

sqlconfig/light-apiengine-develop/sys_role.xml

@@ -0,0 +1,13 @@
+<sqlMap>
+    <sql id="get_role_menu_tree">
+        select sys_menu.* from sys_menu, sys_role_menu
+        where
+        sys_menu.id = sys_role_menu.menu_id
+        and sys_role_menu.role_id = ?role_id
+        and sys_menu.del_flag = 0
+        and sys_menu.hidden = 0
+    </sql>
+    <sql id="del_role_menu">
+        delete from sys_role_menu where role_id = ?
+    </sql>
+</sqlMap>

sqlconfig/system_controller/system_find_role_page_count.tpl

@@ -1,7 +1,13 @@
-
-select
-    count(*) records
-from
-    sys_role
-where
-	del_flag = 0
+
+select
+    count(*) records
+from
+    sys_role
+where
+	del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}

sqlconfig/system_controller/system_find_role_page_select.tpl

@@ -1,8 +1,14 @@
-
-select
-    *
-from
-    sys_role
-where
-    del_flag = 0
-LIMIT {{.rows}} OFFSET {{.offset}}
+
+select
+    *
+from
+    sys_role
+where
+    del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}
+LIMIT {{.rows}} OFFSET {{.offset}}