修改get_menu_tree

controllers/partial/SystemController.go

@@ -84,24 +84,24 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 		return
 	}
 
-	type Role struct {
-		RoleName string `json:"role_name"`
-		UserRole string `json:"user_role"`
-	}
-	//获取用户角色
-	users := result.Content.([]map[string]interface{})
-	for i, user := range users {
-		roles := []Role{}
-		err := c.Db.SqlMapClient("get_roles_by_user_id", user["id"]).Find(&roles)
-		if err != nil {
-			fmt.Println("----", err.Error())
-			continue
-		}
-		users[i]["user_role"] = roles[0].UserRole
-		users[i]["role_name"] = roles[0].RoleName
-	}
-
-	result.Content = users
+	//type Role struct {
+	//	RoleName string `json:"role_name"`
+	//	UserRole string `json:"user_role"`
+	//}
+	////获取用户角色
+	//users := result.Content.([]map[string]interface{})
+	//for i, user := range users {
+	//	roles := []Role{}
+	//	err := c.Db.SqlMapClient("get_roles_by_user_id", user["id"]).Find(&roles)
+	//	if err != nil {
+	//		fmt.Println("----", err.Error())
+	//		continue
+	//	}
+	//	users[i]["user_role"] = roles[0].UserRole
+	//	users[i]["role_name"] = roles[0].RoleName
+	//}
+	//
+	//result.Content = users
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})

engine/system_init.go

@@ -79,7 +79,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Id:             "587c50a4-caad-4557-80c8-aca81af9f370",
 			RoleId:         "387c50a4-caad-4557-80c8-aca81af9f370",
 			UserId:         "187c50a4-caad-4557-80c8-aca81af9f370",
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}
@@ -244,7 +244,7 @@ func initBusinessDbData(domainid, login_id, domain string, db *xorm.Engine, plat
 			Id:         domainid,
 			RoleId:     domainid,
 			UserId:     domainid,
-			CreateTime: time.Now(),
+			CreateTime: models.NowLocal(),
 		},
 	}
 	platform_db.Insert(users)

light-apiengine.xml

@@ -403,7 +403,7 @@
             <column isNull="false" name="user_id" caption="用户ID" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="role_id" caption="角色ID" type="string" size="36" dbtype="varchar(36)"/>
             <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/SysDomain_gen.go

@@ -1,49 +1,50 @@
-
 package models
+
 import (
-	//__import_packages__
+//__import_packages__
 )
 
 type SysDomain 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"`
 	//全名
-	FullName   string    `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
+	FullName string `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
 	//负责人
-	ContactName   string    `xorm:"'contact_name' varchar(36) notnull "json:"contact_name"`
+	ContactName string `xorm:"'contact_name' varchar(36) notnull "json:"contact_name"`
 	//负责人邮箱
-	ContactEmail   string    `xorm:"'contact_email' varchar(50) notnull "json:"contact_email"`
+	ContactEmail string `xorm:"'contact_email' varchar(50) notnull "json:"contact_email"`
 	//负责人电话
-	ContactMobile   string    `xorm:"'contact_mobile' varchar(50) notnull "json:"contact_mobile"`
+	ContactMobile string `xorm:"'contact_mobile' varchar(50) notnull "json:"contact_mobile"`
 	//数据库链接串
-	DataSource   string    `xorm:"'data_source' varchar(200) notnull "json:"data_source"`
+	DataSource string `xorm:"'data_source' varchar(200) notnull "json:"data_source"`
 	//网址
-	DomainUrl   string    `xorm:"'domain_url' varchar(200) notnull "json:"domain_url"`
+	DomainUrl string `xorm:"'domain_url' varchar(200) notnull "json:"domain_url"`
 	//登录页
-	LoginUrl   string    `xorm:"'login_url' varchar(200) notnull "json:"login_url"`
+	LoginUrl string `xorm:"'login_url' varchar(200) notnull "json:"login_url"`
 	//首页
-	IndexUrl   string    `xorm:"'index_url' varchar(200) notnull "json:"index_url"`
+	IndexUrl string `xorm:"'index_url' varchar(200) notnull "json:"index_url"`
+	//样式
+	Theme string `xorm:"'theme' varchar(50) null "json:"theme"`
 	//域类型
-	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"`
 	//是否同步了数据库标志
-	SyncFlag   int32    `xorm:"'sync_flag' notnull "json:"sync_flag"`
+	SyncFlag int32 `xorm:"'sync_flag' notnull "json:"sync_flag"`
 	//域
-	Domain   string    `xorm:"'domain' varchar(36) notnull "json:"domain"`
+	Domain string `xorm:"'domain' varchar(36) 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   LocalTime    `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 *SysDomain) TableName() string {
@@ -51,6 +52,6 @@ func (t *SysDomain) TableName() string {
 }
 
 func init() {
-    AddTableName("sys_domain")
+	AddTableName("sys_domain")
 	RegisterModel(new(SysDomain))
 }

models/SysRoleMenu_gen.go

@@ -1,30 +1,26 @@
-
 package models
+
 import (
-	"time"
 //__import_packages__
 )
 
 type SysRoleMenu struct {
 	//主键
-	Id   string    `xorm:"'id' varchar(36) pk notnull "json:"id"`
+	Id string `xorm:"'id' varchar(36) pk notnull "json:"id"`
 	//用户ID
-	RoleId   string    `xorm:"'role_id' varchar(36) notnull "json:"role_id"`
+	RoleId string `xorm:"'role_id' varchar(36) notnull "json:"role_id"`
 	//角色ID
-	MenuId   string    `xorm:"'menu_id' varchar(36) notnull "json:"menu_id"`
-	//域
-	Domain   string    `xorm:"'domain' notnull "json:"domain"`
+	MenuId string `xorm:"'menu_id' varchar(36) notnull "json:"menu_id"`
 	//创建人
-	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 *SysRoleMenu) TableName() string {
@@ -32,6 +28,6 @@ func (t *SysRoleMenu) TableName() string {
 }
 
 func init() {
-    AddTableName("sys_role_menu")
+	AddTableName("sys_role_menu")
 	RegisterModel(new(SysRoleMenu))
 }

models/SysUserRole_gen.go

@@ -1,30 +1,26 @@
-
 package models
+
 import (
-	"time"
 //__import_packages__
 )
 
 type SysUserRole struct {
 	//主键
-	Id   string    `xorm:"'id' varchar(36) pk notnull "json:"id"`
+	Id string `xorm:"'id' varchar(36) pk notnull "json:"id"`
 	//用户ID
-	UserId   string    `xorm:"'user_id' varchar(36) notnull "json:"user_id"`
+	UserId string `xorm:"'user_id' varchar(36) notnull "json:"user_id"`
 	//角色ID
-	RoleId   string    `xorm:"'role_id' varchar(36) notnull "json:"role_id"`
-	//域
-	Domain   string    `xorm:"'domain' varchar(50) notnull "json:"domain"`
+	RoleId string `xorm:"'role_id' varchar(36) notnull "json:"role_id"`
 	//创建人
-	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 *SysUserRole) TableName() string {
@@ -32,6 +28,6 @@ func (t *SysUserRole) TableName() string {
 }
 
 func init() {
-    AddTableName("sys_user_role")
+	AddTableName("sys_user_role")
 	RegisterModel(new(SysUserRole))
 }

sqlconfig/light-apiengine/sys_domain_gen.xml

@@ -2,13 +2,13 @@
 <sqlMap>
     <sql id="insert_sys_domain">
         insert into sys_domain
-		(`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
+		(`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`theme`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
 		values
-		(?id,?name,?full_name,?contact_name,?contact_email,?contact_mobile,?data_source,?domain_url,?login_url,?index_url,?type,?status,?sync_flag,?domain,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
+		(?id,?name,?full_name,?contact_name,?contact_email,?contact_mobile,?data_source,?domain_url,?login_url,?index_url,?theme,?type,?status,?sync_flag,?domain,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
     </sql>
     <sql id="update_sys_domain">
         update sys_domain set
-		`name` = ?name,`full_name` = ?full_name,`contact_name` = ?contact_name,`contact_email` = ?contact_email,`contact_mobile` = ?contact_mobile,`data_source` = ?data_source,`domain_url` = ?domain_url,`login_url` = ?login_url,`index_url` = ?index_url,`type` = ?type,`status` = ?status,`sync_flag` = ?sync_flag,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_time` = ?last_update_time,`del_flag` = ?del_flag
+		`name` = ?name,`full_name` = ?full_name,`contact_name` = ?contact_name,`contact_email` = ?contact_email,`contact_mobile` = ?contact_mobile,`data_source` = ?data_source,`domain_url` = ?domain_url,`login_url` = ?login_url,`index_url` = ?index_url,`theme` = ?theme,`type` = ?type,`status` = ?status,`sync_flag` = ?sync_flag,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_time` = ?last_update_time,`del_flag` = ?del_flag
 		where id = ?id
     </sql>
     <sql id="deleteone_sys_domain">
@@ -17,13 +17,13 @@
     </sql>
     <sql id="selectone_sys_domain">
         select 
-			`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`theme`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_domain
 		where id = ?id
     </sql>
     <sql id="selectall_sys_domain">
         select 
-			`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`name`,`full_name`,`contact_name`,`contact_email`,`contact_mobile`,`data_source`,`domain_url`,`login_url`,`index_url`,`theme`,`type`,`status`,`sync_flag`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_domain
     </sql>
 </sqlMap>

sqlconfig/light-apiengine/sys_role_menu_gen.xml

@@ -2,13 +2,13 @@
 <sqlMap>
     <sql id="insert_sys_role_menu">
         insert into sys_role_menu
-		(`id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
+		(`id`,`role_id`,`menu_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
 		values
-		(?id,?role_id,?menu_id,?domain,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
+		(?id,?role_id,?menu_id,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
     </sql>
     <sql id="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_time` = ?last_update_time,`del_flag` = ?del_flag
+		`role_id` = ?role_id,`menu_id` = ?menu_id,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_time` = ?last_update_time,`del_flag` = ?del_flag
 		where id = ?id
     </sql>
     <sql id="deleteone_sys_role_menu">
@@ -17,13 +17,13 @@
     </sql>
     <sql id="selectone_sys_role_menu">
         select 
-			`id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`role_id`,`menu_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_role_menu
 		where id = ?id
     </sql>
     <sql id="selectall_sys_role_menu">
         select 
-			`id`,`role_id`,`menu_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`role_id`,`menu_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_role_menu
     </sql>
 </sqlMap>

sqlconfig/light-apiengine/sys_user_role_gen.xml

@@ -2,13 +2,13 @@
 <sqlMap>
     <sql id="insert_sys_user_role">
         insert into sys_user_role
-		(`id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
+		(`id`,`user_id`,`role_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
 		values
-		(?id,?user_id,?role_id,?domain,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
+		(?id,?user_id,?role_id,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
     </sql>
     <sql id="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_time` = ?last_update_time,`del_flag` = ?del_flag
+		`user_id` = ?user_id,`role_id` = ?role_id,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_time` = ?last_update_time,`del_flag` = ?del_flag
 		where id = ?id
     </sql>
     <sql id="deleteone_sys_user_role">
@@ -17,13 +17,13 @@
     </sql>
     <sql id="selectone_sys_user_role">
         select 
-			`id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`user_id`,`role_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_user_role
 		where id = ?id
     </sql>
     <sql id="selectall_sys_user_role">
         select 
-			`id`,`user_id`,`role_id`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`user_id`,`role_id`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_user_role
     </sql>
 </sqlMap>

sqlconfig/system_controller/system_find_user_page_select.tpl

@@ -1,7 +1,9 @@
 
 select
     sys_user.*,
-    GROUP_CONCAT(sys_role.name) user_role
+    sys_org.name org_name,
+    GROUP_CONCAT(sys_role.name) user_role,
+    GROUP_CONCAT(sys_role.id) user_role_id
 from
     sys_user
 left join