'修改添加菜单修改菜单'

controllers/partial/SystemController.go

@@ -380,8 +380,10 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
 	name := c.Ctx.DefaultQuery("name", "")
 	code := c.Ctx.DefaultQuery("code", "")
 	cn_id := c.Ctx.DefaultQuery("cn_id", "")
+	_type := c.Ctx.DefaultQuery("type", "")
+	type_op := c.Ctx.DefaultQuery("type_op", "")
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "name": name, "code": code, "cn_id": cn_id}
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "type": _type, "type_op": type_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})
@@ -489,7 +491,6 @@ func System_AddMenu(c *entitys.CtrlContext) {
 	user := tk.(*entitys.Token)
 
 	paramObj0.Id = sysutils.NewUUID()
-	paramObj0.Domain = user.Domain
 	paramObj0.CreateBy = user.UserId
 	paramObj0.LastUpdateBy = user.UserId
 	paramObj0.CreateTime = models.NowLocal()
@@ -556,12 +557,13 @@ func System_UpdateMenu(c *entitys.CtrlContext) {
 	var paramObj0 models.SysMenu
 	c.Ctx.BindJSON(&paramObj0)
 
-	_, err := c.Db.SqlMapClient("update_sys_menu", paramObj0).Execute()
+	paramMap, err := sysutils.BeanToMap(&paramObj0)
+	_, err = c.Db.SqlMapClient("update_sys_menu", 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})
 	}
 }
 
@@ -706,9 +708,9 @@ func System_AddDomain(c *entitys.CtrlContext) {
 		ret := c.App.AddBusinessDb(paramObj0.Id, "admin@"+paramObj0.Domain, paramObj0.Domain, paramObj0.DataSource)
 		//添加模块初始化配置
 		c.App.AppModuleInit()
-		if ret{
+		if ret {
 			c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
-		}else {
+		} else {
 			c.Ctx.JSON(500, sysmodel.SysReturn{500, "数据库初始化错误。", nil})
 		}
 

light-apiengine.xml

@@ -413,7 +413,6 @@
             <column name="type" caption="类型 0：目录   1：菜单   2：按钮" type="int32"/>
             <column isNull="false" name="icon" caption="菜单图标" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="order_num" caption="排序" 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="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>

models/SysMenuTree_gen.go

@@ -29,8 +29,6 @@ type SysMenuTree struct {
 	Icon string `json:"icon"`
 	//排序
 	OrderNum int32 `json:"order_num"`
-	//域
-	Domain string `json:"domain"`
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间

models/SysMenu_gen.go

@@ -27,8 +27,6 @@ type SysMenu struct {
 	Icon   string    `xorm:"'icon' varchar(50) notnull "json:"icon"`
 	//排序
 	OrderNum   int32    `xorm:"'order_num' notnull "json:"order_num"`
-	//域
-	Domain   string    `xorm:"'domain' varchar(50) notnull "json:"domain"`
 	//创建人
 	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间

sqlconfig/light-apiengine/sys_menu_gen.xml

@@ -2,13 +2,13 @@
 <sqlMap>
     <sql id="insert_sys_menu">
         insert into sys_menu
-		(`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
+		(`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`)
 		values
-		(?id,?name,?code,?parent,?inheritance,?url,?component,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
+		(?id,?name,?code,?parent,?inheritance,?url,?component,?perms,?type,?icon,?order_num,?create_by,?create_time,?last_update_by,?last_update_time,?del_flag)
     </sql>
     <sql id="update_sys_menu">
         update sys_menu set
-		`name` = ?name,`code` = ?code,`parent` = ?parent,`inheritance` = ?inheritance,`url` = ?url,`component` = ?component,`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_time` = ?last_update_time,`del_flag` = ?del_flag
+		`name` = ?name,`code` = ?code,`parent` = ?parent,`inheritance` = ?inheritance,`url` = ?url,`component` = ?component,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`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_menu">
@@ -17,13 +17,13 @@
     </sql>
     <sql id="selectone_sys_menu">
         select 
-			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_menu
 		where id = ?id
     </sql>
     <sql id="selectall_sys_menu">
         select 
-			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
+			`id`,`name`,`code`,`parent`,`inheritance`,`url`,`component`,`perms`,`type`,`icon`,`order_num`,`create_by`,`create_time`,`last_update_by`,`last_update_time`,`del_flag`
         from sys_menu
     </sql>
 </sqlMap>