Ver Fonte

完善角色菜单功能

huangyh há 6 anos atrás
pai
commit
8d7b8885a3
2 ficheiros alterados com 15 adições e 4 exclusões
  1. 14 2
      controllers/partial/SystemController.go
  2. 1 2
      light-apiengine.xml

+ 14 - 2
controllers/partial/SystemController.go

@@ -1020,8 +1020,15 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 func System_GetRoleMenuTree(c *entitys.CtrlContext) {
 	role_id := c.Ctx.Query("role_id")
 
-	op := template.HTML(">=")
+	//paramMap := map[string]interface{}{"role_id": role_id}
+	//sysMenu, err := c.Db.SqlMapClient("get_role_no_have_menu_tree", &paramMap).Query().List()
+	//if err != nil {
+	//	c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+	//	return
+	//}
+	//sysTree, err := sysutils.BuildTree("", sysMenu)
 
+	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 {
@@ -1031,7 +1038,11 @@ func System_GetRoleMenuTree(c *entitys.CtrlContext) {
 
 	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()
+	roleMenu, err := c.Db.SqlMapClient("get_role_menu_tree", &paramMap2).Query().List()
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
 
 	roleTree, err := sysutils.BuildTree("", roleMenu)
 
@@ -1078,6 +1089,7 @@ func System_AddRoleMenu(c *entitys.CtrlContext) {
 		roleMenu.MenuId = menu
 		roleMenu.RoleId = paramObj0.RoleId
 		roleMenu.CreateBy = user.UserId
+		roleMenu.CreateTime = sysmodel.NowLocal()
 
 		roleMenus = append(roleMenus, roleMenu)
 	}

+ 1 - 2
light-apiengine.xml

@@ -439,9 +439,8 @@
             </column>
             <column isNull="false" name="role_id" caption="用户ID" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="menu_id" caption="角色ID" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="domain" caption="域" type="string" size="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"/>