aa

business/jxstore/cms/permission.go

@@ -31,16 +31,16 @@ func AddMenu(ctx *jxcontext.Context, menu *model.Menu) (err error) {
 	if len(menus) > 0 {
 		return fmt.Errorf("添加失败！已存在相同名称的 menu name : %v", menu.Name)
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	dao.WrapAddIDCULDEntity(menu, ctx.GetUserName())
 	err = dao.CreateEntity(db, menu)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
@@ -54,10 +54,10 @@ func UpdateMenu(ctx *jxcontext.Context, menuID int, payload map[string]interface
 	if err != nil {
 		return 0, err
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -65,7 +65,7 @@ func UpdateMenu(ctx *jxcontext.Context, menuID int, payload map[string]interface
 		valid := dao.StrictMakeMapByStructObject(payload, menu, ctx.GetUserName())
 		if len(valid) > 0 {
 			if num, err = dao.UpdateEntityLogically(db, menu, valid, ctx.GetUserName(), nil); err != nil {
-				dao.Rollback(db)
+				dao.Rollback(db, txDB)
 				return 0, err
 			}
 		}
@@ -73,7 +73,7 @@ func UpdateMenu(ctx *jxcontext.Context, menuID int, payload map[string]interface
 		menu.DeletedAt = time.Now()
 		num, err = dao.UpdateEntity(db, menu, "DeletedAt")
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return num, err
 }
 
@@ -92,16 +92,16 @@ func AddRole(ctx *jxcontext.Context, name string) (err error) {
 	role := &model.Role{
 		Name: name,
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	dao.WrapAddIDCULDEntity(role, ctx.GetUserName())
 	err = dao.CreateEntity(db, role)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
@@ -118,10 +118,10 @@ func UpdateRole(ctx *jxcontext.Context, roleID int, name string, isDelete bool)
 	if err != nil {
 		return 0, err
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -134,7 +134,7 @@ func UpdateRole(ctx *jxcontext.Context, roleID int, name string, isDelete bool)
 		role.DeletedAt = time.Now()
 		num, err = dao.UpdateEntity(db, role, "DeletedAt")
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return num, err
 }
 
@@ -177,10 +177,10 @@ func UpdateUserRole(ctx *jxcontext.Context, userIDs []string, roleIDs []int) (er
 			}
 		}
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -208,7 +208,7 @@ func UpdateUserRole(ctx *jxcontext.Context, userIDs []string, roleIDs []int) (er
 			}
 		}
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
@@ -251,10 +251,10 @@ func UpdateRoleMenu(ctx *jxcontext.Context, roleIDs, menuIDs []int) (err error)
 			}
 		}
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
@@ -282,6 +282,6 @@ func UpdateRoleMenu(ctx *jxcontext.Context, roleIDs, menuIDs []int) (err error)
 			}
 		}
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }