refactor🎨: 修正针对sqlite3的事务问题
This commit is contained in:
1 parent
e9f36e74ca
commit
b76db48112
1 file changed
+18
-2
@@ -2,6 +2,7 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
"gorm.io/gorm/clause"
|
"gorm.io/gorm/clause"
|
||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
@@ -71,6 +72,8 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
|
|||||||
}
|
}
|
||||||
c.SysMenu = dataMenu
|
c.SysMenu = dataMenu
|
||||||
c.Generate(&data)
|
c.Generate(&data)
|
||||||
|
tx := e.Orm
|
||||||
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
tx := e.Orm.Begin()
|
tx := e.Orm.Begin()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -79,6 +82,7 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
err = tx.Create(&data).Error
|
err = tx.Create(&data).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -108,7 +112,9 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
|
|||||||
// Update 修改SysRole对象
|
// Update 修改SysRole对象
|
||||||
func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) error {
|
func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) error {
|
||||||
var err error
|
var err error
|
||||||
tx := e.Orm.Debug().Begin()
|
tx := e.Orm
|
||||||
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
|
tx := e.Orm.Begin()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
@@ -116,6 +122,7 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
var model = models.SysRole{}
|
var model = models.SysRole{}
|
||||||
var mlist = make([]models.SysMenu, 0)
|
var mlist = make([]models.SysMenu, 0)
|
||||||
tx.Preload("SysMenu").First(&model, c.GetId())
|
tx.Preload("SysMenu").First(&model, c.GetId())
|
||||||
@@ -164,6 +171,8 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
|
|||||||
// Remove 删除SysRole
|
// Remove 删除SysRole
|
||||||
func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
|
func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
|
||||||
var err error
|
var err error
|
||||||
|
tx := e.Orm
|
||||||
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
tx := e.Orm.Begin()
|
tx := e.Orm.Begin()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -172,6 +181,7 @@ func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
var model = models.SysRole{}
|
var model = models.SysRole{}
|
||||||
tx.Preload("SysMenu").Preload("SysDept").First(&model, c.GetId())
|
tx.Preload("SysMenu").Preload("SysDept").First(&model, c.GetId())
|
||||||
db := tx.Select(clause.Associations).Delete(&model)
|
db := tx.Select(clause.Associations).Delete(&model)
|
||||||
@@ -203,6 +213,8 @@ func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) {
|
|||||||
|
|
||||||
func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
|
func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
|
||||||
var err error
|
var err error
|
||||||
|
tx := e.Orm
|
||||||
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
tx := e.Orm.Begin()
|
tx := e.Orm.Begin()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -211,6 +223,7 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
var dlist = make([]models.SysDept, 0)
|
var dlist = make([]models.SysDept, 0)
|
||||||
var model = models.SysRole{}
|
var model = models.SysRole{}
|
||||||
tx.Preload("SysDept").First(&model, c.RoleId)
|
tx.Preload("SysDept").First(&model, c.RoleId)
|
||||||
@@ -239,7 +252,9 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
|
|||||||
// UpdateStatus 修改SysRole对象status
|
// UpdateStatus 修改SysRole对象status
|
||||||
func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
|
func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
|
||||||
var err error
|
var err error
|
||||||
tx := e.Orm.Debug().Begin()
|
tx := e.Orm
|
||||||
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
|
tx := e.Orm.Begin()
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
@@ -247,6 +262,7 @@ func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
}
|
||||||
var model = models.SysRole{}
|
var model = models.SysRole{}
|
||||||
tx.First(&model, c.GetId())
|
tx.First(&model, c.GetId())
|
||||||
c.Generate(&model)
|
c.Generate(&model)
|
||||||
|
|||||||
Reference in new issue
Block a user