Browse Source

添加sys_user冗余字段,修改menu重复

huangyh 6 years ago
parent
commit
dd34f800f6

+ 6 - 6
models/Sql_SysAttachment_gen.go

@@ -1,11 +1,11 @@
-package models
 
-var Insert_sys_attachment = "insert into sys_attachment(`id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag`) values (?id,?name,?size,?ext,?hash,?url,?create_by,?create_time,?del_flag)"
+package models
+    var Insert_sys_attachment = "insert into sys_attachment(`id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag`) values (?id,?name,?size,?ext,?hash,?url,?create_by,?create_time,?del_flag)"
 
-var Update_sys_attachment = "update sys_attachment set `name` = ?name,`size` = ?size,`ext` = ?ext,`hash` = ?hash,`url` = ?url,`create_by` = ?create_by,`create_time` = ?create_time,`del_flag` = ?del_flag where id = ?id"
+    var Update_sys_attachment = "update sys_attachment set `name` = ?name,`size` = ?size,`ext` = ?ext,`hash` = ?hash,`url` = ?url,`create_by` = ?create_by,`create_time` = ?create_time,`del_flag` = ?del_flag where id = ?id"
 
-var Deleteone_sys_attachment = "delete from sys_attachmentwhere id =?id"
+    var Deleteone_sys_attachment = "delete from sys_attachmentwhere id =?id"
 
-var Selectone_sys_attachment = "select `id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag` from sys_attachment where id = ?"
+    var Selectone_sys_attachment = "select `id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag` from sys_attachment where id = ?id"
 
-var Selectall_sys_attachment = "select `id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag` from sys_attachment"
+    var Selectall_sys_attachment = "select `id`,`name`,`size`,`ext`,`hash`,`url`,`create_by`,`create_time`,`del_flag` from sys_attachment"

+ 2 - 1
models/Sql_SysMenu.go

@@ -79,5 +79,6 @@ ON
 WHERE
 	sys_user.id = ?
 	AND	sys_menu.type != 2 
-	order by sys_menu.order_num asc
+	GROUP BY sys_menu.id
+	ORDER BY sys_menu.order_num asc
 `

+ 4 - 4
models/Sql_SysUser_gen.go

@@ -1,11 +1,11 @@
 
 package models
-    var Insert_sys_user = "insert into sys_user(`id`,`login_id`,`password`,`name`,`full_name`,`mobile`,`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,?mobile,?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`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`option_a`,`option_b`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?login_id,?password,?name,?full_name,?mobile,?email,?org_id,?type,?status,?domain,?option_a,?option_b,?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,`mobile` = ?mobile,`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,`mobile` = ?mobile,`email` = ?email,`org_id` = ?org_id,`type` = ?type,`status` = ?status,`domain` = ?domain,`option_a` = ?option_a,`option_b` = ?option_b,`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_userwhere id =?id"
 
-    var Selectone_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`mobile`,`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`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`option_a`,`option_b`,`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`,`mobile`,`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`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`option_a`,`option_b`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user"

+ 4 - 0
models/SysUser_gen.go

@@ -27,6 +27,10 @@ type SysUser struct {
 	Status   int32    `xorm:"'status' notnull "json:"status"`
 	//域
 	Domain   string    `xorm:"'domain' varchar(50) notnull "json:"domain"`
+	//扩展字段1
+	OptionA   string    `xorm:"'option_a' varchar(50) notnull "json:"option_a"`
+	//扩展字段2
+	OptionB   string    `xorm:"'option_b' varchar(50) notnull "json:"option_b"`
 	//创建人
 	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间

+ 4 - 0
models/UserInfo_gen.go

@@ -27,6 +27,10 @@ type UserInfo struct {
 	Status int32 `json:"status"`
 	//域
 	Domain string `json:"domain"`
+	//扩展字段1
+	OptionA string `json:"option_a"`
+	//扩展字段2
+	OptionB string `json:"option_b"`
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间