新增添加角色

2023-06-13 17:33:04 +08:00
parent 71f682d99a
commit fa56f72c3b
4 changed files with 49 additions and 35 deletions
@@ -162,27 +162,40 @@ func (r *RoleService) AddRole(c *gin.Context, AddRoleRequest requests.AddRole) (

 	// 开始事务
 	tx := global.Db.Begin()
-	// defer func() {
-	// 	if r := recover(); r != nil {
-	// 		tx.Rollback()
-	// 	}
-	// }()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()

 	// 新增角色
 	AdminRoleModel := &model.AdminRole{
-		RoleId:   10,
 		RoleName: AddRoleRequest.RoleName,
 		IsAdmin:  AddRoleRequest.IsAdmin,
 	}

-	adminRole, err = AdminRoleDao.AddAdminRole(tx, AdminRoleModel)
-	if err != nil || adminRole == nil {
+	adminRole, _ = AdminRoleDao.AddAdminRole(tx, AdminRoleModel)
+	if adminRole == nil {
 		tx.Rollback()
-		return false, errors.New("非法操作")
+		return false, errors.New("新增失败")
+	}
+
+	// 新增角色菜单
+	AdminRoleMenuDao := dao.AdminRoleMenuDao{}
+	for _, menuId := range AddRoleRequest.MenuIds {
+		AdminRoleMenuModel := &model.AdminRoleMenu{
+			RoleID: adminRole.RoleId,
+			MenuID: menuId,
+		}
+
+		adminRoleMenu, _ := AdminRoleMenuDao.AddAdminRoleMenu(tx, AdminRoleMenuModel)
+		if adminRoleMenu == nil {
+			tx.Rollback()
+			return false, errors.New("新增失败")
+		}
 	}

 	tx.Commit()
-	// 新增角色菜单

 	return true, nil
 }