修改1

api/controller/menu.go

@@ -17,7 +17,7 @@ func (r *Menu) GetMenuList(c *gin.Context) {
 		return
 	}
 
-	if len(MenuList) == 0 {
+	if MenuList == nil {
 		responses.FailWithMessage("请联系管理人员设置菜单", c)
 		return
 	}

api/controller/role.go

@@ -62,7 +62,7 @@ func (r *Role) GetRoleList(c *gin.Context) {
 
 	AdminRoleDao := dao.AdminRoleDao{}
 	adminRole, err := AdminRoleDao.GetAdminRolePageSearch(RoleRequest.GetRoleList.RoleName, RoleRequest.GetRoleList.Page, RoleRequest.GetRoleList.PageSize)
-	if err != nil || len(adminRole) == 0 {
+	if err != nil || adminRole == nil {
 		responses.Ok(c)
 		c.Abort()
 		return
@@ -116,17 +116,29 @@ func (r *Role) PutRoleStatus(c *gin.Context) {
 
 // AddRole 新增角色
 func (r *Role) AddRole(c *gin.Context) {
-	// if err := c.ShouldBind(&RoleRequest.PutRoleStatus); err != nil {
-	// 	responses.FailWithMessage(err.Error(), c)
-	// 	return
-	// }
-	//
-	// // 参数验证
-	// if err := global.Validate.Struct(RoleRequest.PutRoleStatus); err != nil {
-	// 	responses.FailWithMessage(utils.Translate(err), c)
-	// 	return
-	// }
+	if err := c.ShouldBindJSON(&RoleRequest.AddRole); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
 
+	// 参数验证
+	if err := global.Validate.Struct(RoleRequest.AddRole); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	// 判断菜单数据是否为空
+	if len(RoleRequest.AddRole.MenuIds) == 0 {
+		responses.FailWithMessage("请为角色添加菜单", c)
+		return
+	}
+
+	RoleService := service.RoleService{}
+	_, err := RoleService.AddRole(c, RoleRequest.AddRole)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
 	responses.Ok(c)
 }