add api:get_sysorg_tree

controllers/SystemController.go

@@ -2,7 +2,7 @@
 package controllers
 
 import (
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
+	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	"fmt"
 )
 //https://www.kancloud.cn/xormplus/xorm/167077
@@ -11,24 +11,23 @@ import (
 // @Title _Login
 // @Description 用户登录
 // @Param	logininfo      false  "登录信息"
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_Login(c *SystemController) {
-	var logininfo models.LoginInfo
+	var logininfo sysmodel.LoginInfo
 	c.Ctx.BindJSON(&logininfo)
-	__none_func__(logininfo)
+	__none_func_system__(logininfo)
 	fmt.Println(logininfo)
-	var user models.SysUser
-	//pm := map[string]string{"login_id": logininfo.Account}
-	ret, err:=c.Db.SQL(models.SqlUserLogin, logininfo.Account).Get(&user)
+	var user sysmodel.SysUser
+	ret, err:=c.Db.SQL(sysmodel.SqlUserLogin, logininfo.Account).Get(&user)
 	if ret && err ==nil{
 		//TODO check password
 
-		data:=models.LoginReturnInfo{user.Id,user.LoginId,user.Id}
-		c.Ctx.JSON(200, models.SysReturn{200, "", data})
+		data:=sysmodel.LoginReturnInfo{user.Id,user.LoginId,user.Id}
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", data})
 	}else {
 		//fmt.Println(err.Error())
-		c.Ctx.JSON(200, models.SysReturn{400, "username or passowrd incorrect!", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{400, "username or passowrd incorrect!", nil})
 	}
 
 }
@@ -36,15 +35,15 @@ func System_Login(c *SystemController) {
 // _Logout
 // @Title _Logout
 // @Description 用户退出
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_Logout(c *SystemController) {
 
-	ret := __none_func__()
+	ret := __none_func_system__()
 	if ret {
-		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
-		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
@@ -53,26 +52,64 @@ func System_Logout(c *SystemController) {
 // @Title _GetMenuTree
 // @Description 获取系统菜单
 // @Param	user    string  false  "用户id"
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
-	var menus []models.SysMenuTree
-	c.Db.SQL(models.Selectall_sys_menu).Find(&menus)
+	ret := __none_func_system__(user)
+	var menus []sysmodel.SysMenuTree
+	c.Db.SQL(sysmodel.Selectall_sys_menu).Find(&menus)
 
-	var menutree []models.SysMenuTree
+	var menutree []sysmodel.SysMenuTree
 	finChildrenMenu( &menus, "", nil, &menutree)
 	for i:=0;i<len(menutree);i++{
 		finChildrenMenu( &menus, menutree[i].Id, &menutree[i], &menutree)
 	}
 	if ret{
-		c.Ctx.JSON(200, models.SysReturn{200, "", menutree})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menutree})
 	}
+}
+
+// _GetOrgTree
+// @Title _GetOrgTree
+// @Description 获取组织架构树
+// @Success 200 {object} sysmodel.Account
+// @Failure 403 :id is empty
+func System_GetOrgTree(c *SystemController) {
+
+	ret := __none_func_system__()
+
+	var orgs []sysmodel.SysOrgTree
+	c.Db.SQL(sysmodel.Selectall_sys_org).Find(&orgs)
+
+	var orgtree []sysmodel.SysOrgTree
+	finChildrenOrg( &orgs, "", nil, &orgtree)
+	for i:=0;i<len(orgtree);i++{
+		finChildrenOrg( &orgs, orgtree[i].Id, &orgtree[i], &orgtree)
+	}
+
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", orgtree})
+	}else{
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
 
+func finChildrenOrg(menus *[]sysmodel.SysOrgTree, parent string, parent_menu* sysmodel.SysOrgTree, menutree *[]sysmodel.SysOrgTree) {
+	for _,m:= range *menus{
+		if m.Parent == parent {
+			if parent_menu == nil{
+				*menutree = append(*menutree, m)
+				//finChildrenMenu(menus, m.Id, menutree[len(*menutree)-1], menutree)
+			}else {
+				parent_menu.Children = append(parent_menu.Children,m)
+				finChildrenOrg(menus, m.Id, &parent_menu.Children[len(parent_menu.Children)-1], menutree)
+			}
+		}
+	}
 }
 
-func finChildrenMenu(menus *[]models.SysMenuTree, parent string, parent_menu* models.SysMenuTree, menutree *[]models.SysMenuTree) {
+func finChildrenMenu(menus *[]sysmodel.SysMenuTree, parent string, parent_menu* sysmodel.SysMenuTree, menutree *[]sysmodel.SysMenuTree) {
 	for _,m:= range *menus{
 		if m.Parent == parent {
 			if parent_menu == nil{
@@ -90,20 +127,25 @@ func finChildrenMenu(menus *[]models.SysMenuTree, parent string, parent_menu* mo
 // @Title _FindUserPage
 // @Description 获取用户分布数据
 // @Param	page      false  "分页参数"
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_FindUserPage(c *SystemController) {
-	var getpageinfo models.GetPageInfo
+	var getpageinfo sysmodel.GetPageInfo
 	c.Ctx.BindJSON(&getpageinfo)
-	__none_func__(getpageinfo)
+	__none_func_system__(getpageinfo)
 	fmt.Println(getpageinfo)
-	var users []models.SysUser
-	err := c.Db.SQL(models.Selectall_sys_user).Limit(getpageinfo.PageSize, (getpageinfo.PageNum -1)*getpageinfo.PageSize).Find(&users)
+	page := sysmodel.SysUserPageInfo{}
+	var users []sysmodel.SysUser
+	err := c.Db.SQL(sysmodel.Selectall_sys_user).Limit(getpageinfo.PageSize, (getpageinfo.PageNum -1)*getpageinfo.PageSize).Find(&users)
+	page.Content = users
+	page.PageSize = getpageinfo.PageSize
+	page.PageNum = getpageinfo.PageNum
+	page.TotalSize = 1
 	if err==nil{
-		c.Ctx.JSON(200, models.SysReturn{200, "", users})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", page})
 	}else {
 		fmt.Println(err.Error())
-		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}
 
 }
@@ -112,15 +154,15 @@ func System_FindUserPage(c *SystemController) {
 // @Title _FindPermissions
 // @Description 查找用户的菜单权限标识集合
 // @Param	user    string  false  "用户id"
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_FindPermissions(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
+	ret := __none_func_system__(user)
 	if ret {
-		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
-		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
@@ -128,19 +170,19 @@ func System_FindPermissions(c *SystemController) {
 // @Title _AddPermission
 // @Description 查找用户的菜单权限标识集合
 // @Param	user    string  false  "用户id"
-// @Success 200 {object} models.Account
+// @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_AddPermission(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
+	ret := __none_func_system__(user)
 	if ret {
-		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
-		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 
-func __none_func__(params ... interface{}) bool{
+func __none_func_system__(params ... interface{}) bool{
 	return true
 }

controllers/SystemController.go_new

@@ -16,7 +16,7 @@ import (
 func System_Login(c *SystemController) {
 	var logininfo models.LoginInfo 
 	c.Ctx.BindJSON(&logininfo)
-	ret := __none_func__(logininfo)
+	ret := __none_func_system__(logininfo)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -31,7 +31,7 @@ func System_Login(c *SystemController) {
 // @Failure 403 :id is empty
 func System_Logout(c *SystemController) {
 	
-	ret := __none_func__()
+	ret := __none_func_system__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -47,7 +47,7 @@ func System_Logout(c *SystemController) {
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
+	ret := __none_func_system__(user)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -64,7 +64,22 @@ func System_GetMenuTree(c *SystemController) {
 func System_FindUserPage(c *SystemController) {
 	var getpageinfo models.GetPageInfo 
 	c.Ctx.BindJSON(&getpageinfo)
-	ret := __none_func__(getpageinfo)
+	ret := __none_func_system__(getpageinfo)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _GetOrgTree
+// @Title _GetOrgTree
+// @Description 获取组织架构树         
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_GetOrgTree(c *SystemController) {
+	
+	ret := __none_func_system__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -80,7 +95,7 @@ func System_FindUserPage(c *SystemController) {
 // @Failure 403 :id is empty
 func System_FindPermissions(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
+	ret := __none_func_system__(user)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -96,7 +111,7 @@ func System_FindPermissions(c *SystemController) {
 // @Failure 403 :id is empty
 func System_AddPermission(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	ret := __none_func__(user)
+	ret := __none_func_system__(user)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	}else{
@@ -105,6 +120,6 @@ func System_AddPermission(c *SystemController) {
 }
 
 
-func __none_func__(params ... interface{}) bool{
+func __none_func_system__(params ... interface{}) bool{
 	return true
 }

controllers/SystemController_gen.go

@@ -68,6 +68,17 @@ func (c *SystemController) FindUserPage() {
 	System_FindUserPage(c)
 }
 
+// GetOrgTree
+// @Title GetOrgTree
+// @Description 获取组织架构树         
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /get_org_tree  [post,get]
+func (c *SystemController) GetOrgTree() {
+	//
+	System_GetOrgTree(c)
+}
+
 // FindPermissions
 // @Title FindPermissions
 // @Description 查找用户的菜单权限标识集合         

engine/apiengine.go

@@ -21,7 +21,6 @@ func Default()  *ApiEngine{
 }
 
 func NewApiEngine(driverName, dataSourceName string, addr string) *ApiEngine {
-	gin.SetMode(config.AppConfig.RunMode)
 	engine := &ApiEngine{}
 	var err error
 	engine.OrmEngine, err = xorm.NewEngine(driverName, dataSourceName)

models/Sql_SysMenu_gen.go

@@ -1,45 +1,11 @@
 
 package models
-    var Insert_sys_menu = ` 
-        insert into sys_menu
-		(id,name,code,parent,url,perms,type,icon,order_num,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?name,?code,?parent,?url,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_menu = "insert into sys_menu(`id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?name,?code,?parent,?url,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_menu = ` 
-        update sys_menu set
-		name = ?name,
-		code = ?code,
-		parent = ?parent,
-		url = ?url,
-		perms = ?perms,
-		type = ?type,
-		icon = ?icon,
-		order_num = ?order_num,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_menu = "update sys_menu set `name` = ?name,`code` = ?code,`parent` = ?parent,`url` = ?url,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_menu = ` 
-        delete from sys_menu
-		where id =?id
-`
+    var Deleteone_sys_menu = "delete from sys_menuwhere id =?id"
 
-    var Selectone_sys_menu = ` 
-        select 
-			id,name,code,parent,url,perms,type,icon,order_num,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_menu
-		where id = ?id
-`
+    var Selectone_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu where id = ?id"
 
-    var Selectall_sys_menu = ` 
-        select 
-			id,name,code,parent,url,perms,type,icon,order_num,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_menu
-`
+    var Selectall_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu"

models/Sql_SysOrg_gen.go

@@ -1,44 +1,11 @@
 
 package models
-    var Insert_sys_org = ` 
-        insert into sys_org
-		(id,parent,name,full_name,leader,type,order,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?parent,?name,?full_name,?leader,?type,?order,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_org = "insert into sys_org(`id`,`parent`,`name`,`full_name`,`leader`,`type`,`order`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?parent,?name,?full_name,?leader,?type,?order,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_org = ` 
-        update sys_org set
-		parent = ?parent,
-		name = ?name,
-		full_name = ?full_name,
-		leader = ?leader,
-		type = ?type,
-		order = ?order,
-		status = ?status,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_org = "update sys_org set `parent` = ?parent,`name` = ?name,`full_name` = ?full_name,`leader` = ?leader,`type` = ?type,`order` = ?order,`status` = ?status,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_org = ` 
-        delete from sys_org
-		where id =?id
-`
+    var Deleteone_sys_org = "delete from sys_orgwhere id =?id"
 
-    var Selectone_sys_org = ` 
-        select 
-			id,parent,name,full_name,leader,type,order,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_org
-		where id = ?id
-`
+    var Selectone_sys_org = "select `id`,`parent`,`name`,`full_name`,`leader`,`type`,`order`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_org where id = ?id"
 
-    var Selectall_sys_org = ` 
-        select 
-			id,parent,name,full_name,leader,type,order,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_org
-`
+    var Selectall_sys_org = "select `id`,`parent`,`name`,`full_name`,`leader`,`type`,`order`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_org"

models/Sql_SysRoleMenu_gen.go

@@ -1,39 +1,11 @@
 
 package models
-    var Insert_sys_role_menu = ` 
-        insert into sys_role_menu
-		(id,role_id,menu_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?role_id,?menu_id,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_role_menu = "insert into sys_role_menu(`id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?role_id,?menu_id,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_role_menu = ` 
-        update sys_role_menu set
-		role_id = ?role_id,
-		menu_id = ?menu_id,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_role_menu = "update sys_role_menu set `role_id` = ?role_id,`menu_id` = ?menu_id,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_role_menu = ` 
-        delete from sys_role_menu
-		where id =?id
-`
+    var Deleteone_sys_role_menu = "delete from sys_role_menuwhere id =?id"
 
-    var Selectone_sys_role_menu = ` 
-        select 
-			id,role_id,menu_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_role_menu
-		where id = ?id
-`
+    var Selectone_sys_role_menu = "select `id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_role_menu where id = ?id"
 
-    var Selectall_sys_role_menu = ` 
-        select 
-			id,role_id,menu_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_role_menu
-`
+    var Selectall_sys_role_menu = "select `id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_role_menu"

models/Sql_SysRole_gen.go

@@ -1,41 +1,11 @@
 
 package models
-    var Insert_sys_role = ` 
-        insert into sys_role
-		(id,name,code,remark,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?name,?code,?remark,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_role = "insert into sys_role(`id`,`name`,`code`,`remark`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?name,?code,?remark,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_role = ` 
-        update sys_role set
-		name = ?name,
-		code = ?code,
-		remark = ?remark,
-		status = ?status,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_role = "update sys_role set `name` = ?name,`code` = ?code,`remark` = ?remark,`status` = ?status,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_role = ` 
-        delete from sys_role
-		where id =?id
-`
+    var Deleteone_sys_role = "delete from sys_rolewhere id =?id"
 
-    var Selectone_sys_role = ` 
-        select 
-			id,name,code,remark,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_role
-		where id = ?id
-`
+    var Selectone_sys_role = "select `id`,`name`,`code`,`remark`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_role where id = ?id"
 
-    var Selectall_sys_role = ` 
-        select 
-			id,name,code,remark,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_role
-`
+    var Selectall_sys_role = "select `id`,`name`,`code`,`remark`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_role"

models/Sql_SysUserRole_gen.go

@@ -1,39 +1,11 @@
 
 package models
-    var Insert_sys_user_role = ` 
-        insert into sys_user_role
-		(id,user_id,role_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?user_id,?role_id,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_user_role = "insert into sys_user_role(`id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?user_id,?role_id,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_user_role = ` 
-        update sys_user_role set
-		user_id = ?user_id,
-		role_id = ?role_id,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_user_role = "update sys_user_role set `user_id` = ?user_id,`role_id` = ?role_id,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_user_role = ` 
-        delete from sys_user_role
-		where id =?id
-`
+    var Deleteone_sys_user_role = "delete from sys_user_rolewhere id =?id"
 
-    var Selectone_sys_user_role = ` 
-        select 
-			id,user_id,role_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_user_role
-		where id = ?id
-`
+    var Selectone_sys_user_role = "select `id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user_role where id = ?id"
 
-    var Selectall_sys_user_role = ` 
-        select 
-			id,user_id,role_id,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_user_role
-`
+    var Selectall_sys_user_role = "select `id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user_role"

models/Sql_SysUser_gen.go

@@ -1,45 +1,11 @@
 
 package models
-    var Insert_sys_user = ` 
-        insert into sys_user
-		(id,login_id,password,name,full_name,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag)
-		values
-		(?id,?login_id,?password,?name,?full_name,?email,?org_id,?type,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)
-`
+    var Insert_sys_user = "insert into sys_user(`id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?login_id,?password,?name,?full_name,?email,?org_id,?type,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_user = ` 
-        update sys_user set
-		login_id = ?login_id,
-		password = ?password,
-		name = ?name,
-		full_name = ?full_name,
-		email = ?email,
-		org_id = ?org_id,
-		type = ?type,
-		status = ?status,
-		domain = ?domain,
-		create_by = ?create_by,
-		create_time = ?create_time,
-		last_update_by = ?last_update_by,
-		last_update_date = ?last_update_date,
-		del_flag = ?del_flag
-		where id = ?id
- `
+    var Update_sys_user = "update sys_user set `login_id` = ?login_id,`password` = ?password,`name` = ?name,`full_name` = ?full_name,`email` = ?email,`org_id` = ?org_id,`type` = ?type,`status` = ?status,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_user = ` 
-        delete from sys_user
-		where id =?id
-`
+    var Deleteone_sys_user = "delete from sys_userwhere id =?id"
 
-    var Selectone_sys_user = ` 
-        select 
-			id,login_id,password,name,full_name,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_user
-		where id = ?id
-`
+    var Selectone_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user where id = ?id"
 
-    var Selectall_sys_user = ` 
-        select 
-			id,login_id,password,name,full_name,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
-        from sys_user
-`
+    var Selectall_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user"

models/SysOrgTree_gen.go

@@ -0,0 +1,40 @@
+
+package models
+import (
+"time"
+)
+
+type SysOrgTree struct {
+		//主键
+	Id string `json:"id"`
+	//上级组织
+	Parent string `json:"parent"`
+	//名称
+	Name string `json:"name"`
+	//全名
+	FullName string `json:"full_name"`
+	//领导人
+	Leader string `json:"leader"`
+	//组织类型
+	Type int32 `json:"type"`
+	//排序
+	Order int32 `json:"order"`
+	//状态 0：禁用   1：正常
+	Status int32 `json:"status"`
+	//域
+	Domain string `json:"domain"`
+	//创建人
+	CreateBy string `json:"create_by"`
+	//创建时间
+	CreateTime time.Time `json:"create_time"`
+	//最后更新人
+	LastUpdateBy string `json:"last_update_by"`
+	//最后更新时间
+	LastUpdateDate time.Time `json:"last_update_date"`
+	//是否删除 0：删除   1：正常
+	DelFlag int32 `json:"del_flag"`
+
+	//子列表
+	Children   []SysOrgTree `json:"children"`
+
+}

models/SysUserPageInfo_gen.go

@@ -0,0 +1,18 @@
+
+package models
+import (
+
+)
+
+type SysUserPageInfo struct {
+	
+	//页码
+	PageNum   int `json:"pageNum"`
+	//单页数
+	PageSize   int `json:"pageSize"`
+	//总页数
+	TotalSize   int `json:"totalSize"`
+	//内容
+	Content   []SysUser `json:"content"`
+
+}

routers/router_gen.go

@@ -28,6 +28,10 @@ func systemController_find_user_page(c* gin.Context)  {
 	controllers.NewSystemController(c,g_engine).FindUserPage()
 }
 
+func systemController_get_org_tree(c* gin.Context)  {
+	controllers.NewSystemController(c,g_engine).GetOrgTree()
+}
+
 func systemController_find_permissions(c* gin.Context)  {
 	controllers.NewSystemController(c,g_engine).FindPermissions()
 }
@@ -61,6 +65,10 @@ func InitRouter(e *engine.ApiEngine)  {
 	v1.POST("/system/find_user_page",systemController_find_user_page)
     //v1.PUT("/system/find_user_page",systemController_find_user_page)
 
+	v1.GET("/system/get_org_tree",systemController_get_org_tree)
+	v1.POST("/system/get_org_tree",systemController_get_org_tree)
+    //v1.PUT("/system/get_org_tree",systemController_get_org_tree)
+
 	v1.GET("/system/find_permissions",systemController_find_permissions)
 	v1.POST("/system/find_permissions",systemController_find_permissions)
     v1.PUT("/system/find_permissions",systemController_find_permissions)