新增菜单，修改角色，分页

api/service/role.go

@@ -13,22 +13,23 @@ import (
 type RoleService struct{}
 
 // GetRoleMenuList 获取角色菜单
-func (r *RoleService) GetRoleMenuList(roleId int64) ([]*roleResponse.RoleMenuList, error) {
+func (r *RoleService) GetRoleMenuList(roleId int64) ([]*roleResponse.GetRoleMenuList, error) {
+	// 获取角色菜单
 	AdminRoleMenuDao := dao.AdminRoleMenuDao{}
 	adminRoleMenu, _ := AdminRoleMenuDao.GetAdminRoleMenuListByRoleId(roleId)
 	if adminRoleMenu == nil {
-		return []*roleResponse.RoleMenuList{}, nil
+		return []*roleResponse.GetRoleMenuList{}, nil
 	}
 
-	// 获取全部菜单
+	// 获取全部正常菜单列表
 	AdminMenuDao := dao.AdminMenuDao{}
-	adminMenu, _ := AdminMenuDao.GetAdminMenuListSortOrderNum()
+	adminMenu, _ := AdminMenuDao.GetAdminMenuListNormalSortOrderNum()
 	if adminMenu == nil {
-		return []*roleResponse.RoleMenuList{}, nil
+		return []*roleResponse.GetRoleMenuList{}, nil
 	}
 
 	var menuIDs []int64
-	var menuTree []*roleResponse.RoleMenuList
+	var menuTree []*roleResponse.GetRoleMenuList
 
 	if len(adminRoleMenu) > 0 {
 		for _, roleMenu := range adminRoleMenu {
@@ -43,15 +44,15 @@ func (r *RoleService) GetRoleMenuList(roleId int64) ([]*roleResponse.RoleMenuLis
 }
 
 // 获取角色菜单-构建菜单树
-func buildMenuTree(menuIds []int64, menuData []*model.AdminMenu) []*roleResponse.RoleMenuList {
-	menuMap := make(map[int64]*roleResponse.RoleMenuList)
-	rootNodes := make([]*roleResponse.RoleMenuList, 0)
+func buildMenuTree(menuIds []int64, menuData []*model.AdminMenu) []*roleResponse.GetRoleMenuList {
+	menuMap := make(map[int64]*roleResponse.GetRoleMenuList)
+	rootNodes := make([]*roleResponse.GetRoleMenuList, 0)
 
 	// 构建菜单映射
 	for _, menu := range menuData {
 		for _, v := range menuIds {
 			if v == menu.MenuId {
-				node := &roleResponse.RoleMenuList{
+				node := &roleResponse.GetRoleMenuList{
 					MenuId:     menu.MenuId,
 					MenuName:   menu.MenuName,
 					MenuTitle:  menu.MenuTitle,
@@ -199,3 +200,76 @@ func (r *RoleService) AddRole(c *gin.Context, AddRoleRequest requests.AddRole) (
 
 	return true, nil
 }
+
+// PutRole 修改角色
+func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleRequest requests.PutRole) (bool, error) {
+	// 获取当前登陆用户数据
+	roleId := c.GetInt64("RoleId")
+	if roleId == 0 {
+		return false, errors.New("数据错误")
+	}
+
+	AdminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := AdminRoleDao.GetAdminRoleFirstById(roleId)
+	if err != nil || adminRole == nil {
+		return false, errors.New("非法操作")
+	}
+
+	if AddRoleRequest.IsAdmin == 1 && adminRole.IsAdmin == 0 {
+		return false, errors.New("您当前为普通用户，无法设置管理员")
+	}
+
+	AdminMenuDao := dao.AdminMenuDao{}
+
+	// 判断菜单id
+	for _, menuId := range AddRoleRequest.MenuIds {
+		adminMenu, _ := AdminMenuDao.GetAdminMenuById(menuId)
+		if adminMenu == nil {
+			return false, errors.New("菜单错误")
+		}
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 修改角色
+	data := make(map[string]interface{})
+	data["role_name"] = AddRoleRequest.RoleName
+	data["is_admin"] = AddRoleRequest.IsAdmin
+	err = AdminRoleDao.EditAdminRoleById(tx, requestRoleId, data)
+	if err != nil {
+		tx.Rollback()
+		return false, errors.New("修改失败")
+	}
+
+	AdminRoleMenuDao := dao.AdminRoleMenuDao{}
+	// 删除角色菜单
+	err = AdminRoleMenuDao.DeleteAdminRoleMenuByRoleId(tx, requestRoleId)
+	if err != nil {
+		tx.Rollback()
+		return false, errors.New("修改失败")
+	}
+
+	// 新增角色菜单
+	for _, menuId := range AddRoleRequest.MenuIds {
+		AdminRoleMenuModel := &model.AdminRoleMenu{
+			RoleID: requestRoleId,
+			MenuID: menuId,
+		}
+
+		adminRoleMenu, _ := AdminRoleMenuDao.AddAdminRoleMenu(tx, AdminRoleMenuModel)
+		if adminRoleMenu == nil {
+			tx.Rollback()
+			return false, errors.New("新增失败")
+		}
+	}
+
+	tx.Commit()
+
+	return true, nil
+}