diff --git a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go index 2a087a8c..52e9e34f 100644 --- a/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go +++ b/dsBaseRpc/RpcService/BaseRoleMenu/BaseRoleMenuService/BaseRoleMenuService.go @@ -49,8 +49,8 @@ func (s *Rpc) SetBaseRoleMenuCorr(ctx context.Context, in *BaseRoleMenuProto.Set }() //声明实体数组 modelArray := make([]models.TBaseRoleMenu, 0) - //循环添加班级 - for i := 0; i <= len(in.MenuIds); i++ { + + for i := 0; i < len(in.MenuIds); i++ { model := new(models.TBaseRoleMenu) model.Id = CommonUtil.GetUUID() model.MenuId = in.MenuIds[i] diff --git a/dsBaseWeb/Business/BaseRoleMenu/BaseRoleMenuController/BaseRoleMenuController.go b/dsBaseWeb/Business/BaseRoleMenu/BaseRoleMenuController/BaseRoleMenuController.go index 1ad2236d..5c5a114f 100644 --- a/dsBaseWeb/Business/BaseRoleMenu/BaseRoleMenuController/BaseRoleMenuController.go +++ b/dsBaseWeb/Business/BaseRoleMenu/BaseRoleMenuController/BaseRoleMenuController.go @@ -8,6 +8,15 @@ import ( "net/http" ) +func Routers(r *gin.RouterGroup) { + rr := r.Group("/role") + + rr.GET("/GetRoleMenuCorrInfo", GetRoleMenuCorrInfo) + rr.POST("/SetRoleMenuCorrInfo", SetRoleMenuCorrInfo) + + return +} + // @Summary 获取角色菜单对应关系 // @Description 获取角色菜单对应关系 // @Tags 角色信息 @@ -15,12 +24,12 @@ import ( // @Produce json // @Param roleId query string true "角色ID" // @Success 200 {object} Model.Res -// @Router /base/role/GetBaseRoleMenuCorrInfo [get] +// @Router /base/role/GetRoleMenuCorrInfo [get] // @X-EmptyLimit ["roleId"] // @X-LengthLimit [{"roleId":"36,36"}] // @X-RoleLimit ["1"] // @X-Sort [1] -func GetBaseRoleMenuCorrInfo(c *gin.Context) { +func GetRoleMenuCorrInfo(c *gin.Context) { //角色ID roleId := c.Query("roleId") r, err := BaseRoleMenuService.GetBaseRoleMenuCorrInfo(roleId) @@ -47,12 +56,12 @@ func GetBaseRoleMenuCorrInfo(c *gin.Context) { // @Param roleId formData string true "角色ID" // @Param menuIds formData string true "菜单ID,多个用逗号分隔" // @Success 200 {object} Model.Res -// @Router /base/role/SetBaseRoleMenuCorrInfo [post] +// @Router /base/role/SetRoleMenuCorrInfo [post] // @X-EmptyLimit ["roleId","menuIds"] // @X-LengthLimit [{"roleId":"36,36"},{"menuIds":"36,1800"}] // @X-RoleLimit ["1"] // @X-Sort [2] -func SetBaseRoleMenuCorrInfo(c *gin.Context) { +func SetRoleMenuCorrInfo(c *gin.Context) { //角色ID roleId := c.PostForm("roleId") //菜单ID diff --git a/dsBaseWeb/Router/BaseRouter.go b/dsBaseWeb/Router/BaseRouter.go index f94d7d6a..13186f64 100644 --- a/dsBaseWeb/Router/BaseRouter.go +++ b/dsBaseWeb/Router/BaseRouter.go @@ -8,6 +8,7 @@ import ( "dsBaseWeb/Business/BasePosition/BasePositionController" "dsBaseWeb/Business/BasePurview/BasePurviewController" "dsBaseWeb/Business/BaseRole/BaseRoleController" + "dsBaseWeb/Business/BaseRoleMenu/BaseRoleMenuController" "dsBaseWeb/Business/BaseRolePerson/BaseRolePersonController" "dsBaseWeb/Business/BaseStudent/BaseStudentController" "dsBaseWeb/Business/BaseTeacher/BaseTeacherController" @@ -50,4 +51,6 @@ func GinRouter(r *gin.Engine) { BaseMenuController.Routers(rr) BaseRoleController.Routers(rr) + + BaseRoleMenuController.Routers(rr) }