Merge pull request #710 from zyd/master

fix🐛:e.Log.Errorf("db error:%s", err)输出的err没有被赋值
This commit is contained in:
wenjianzhang authored and GitHub committed 2022-10-08 15:00:33 +08:00
commit cc0cdc7d0e
10 files changed
+22 -22

No files matched your search

+1 -1
View File
@@ -142,7 +142,7 @@ func (e *SysConfig) Remove(d *dto.SysConfigDeleteReq) error {
var data models.SysConfig
db := e.Orm.Delete(&data, d.Ids)
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Service RemoveSysConfig error:%s", err)
return err
+3 -3
View File
@@ -49,7 +49,7 @@ func (e *SysDept) Get(d *dto.SysDeptGetReq, model *models.SysDept) error {
e.Log.Errorf("db error:%s", err)
return err
}
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -116,7 +116,7 @@ func (e *SysDept) Update(c *dto.SysDeptUpdateReq) error {
}
model.DeptPath = deptPath
db := tx.Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("UpdateSysDept error:%s", err)
return err
}
@@ -132,7 +132,7 @@ func (e *SysDept) Remove(d *dto.SysDeptDeleteReq) error {
var data models.SysDept
db := e.Orm.Model(&data).Delete(&data, d.GetId())
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
return err
+2 -2
View File
@@ -47,7 +47,7 @@ func (e *SysDictData) Get(d *dto.SysDictDataGetReq, model *models.SysDictData) e
e.Log.Errorf("db error: %s", err)
return err
}
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error: %s", err)
return err
}
@@ -91,7 +91,7 @@ func (e *SysDictData) Remove(c *dto.SysDictDataDeleteReq) error {
var data models.SysDictData
db := e.Orm.Delete(&data, c.GetId())
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
return err
+3 -3
View File
@@ -45,7 +45,7 @@ func (e *SysDictType) Get(d *dto.SysDictTypeGetReq, model *models.SysDictType) e
e.Log.Errorf("db error: %s", err)
return err
}
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error: %s", err)
return err
}
@@ -77,7 +77,7 @@ func (e *SysDictType) Update(c *dto.SysDictTypeUpdateReq) error {
e.Orm.First(&model, c.GetId())
c.Generate(&model)
db := e.Orm.Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error: %s", err)
return err
}
@@ -94,7 +94,7 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeDeleteReq) error {
var data models.SysDictType
db := e.Orm.Delete(&data, d.GetId())
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
return err
+2 -2
View File
@@ -44,7 +44,7 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) e
e.Log.Errorf("db error:%s", err)
return err
}
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -57,7 +57,7 @@ func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
var data models.SysLoginLog
db := e.Orm.Delete(&data, c.GetId())
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
return err
+2 -2
View File
@@ -147,7 +147,7 @@ func (e *SysMenu) Update(c *dto.SysMenuUpdateReq) *SysMenu {
c.Generate(&model)
model.SysApi = alist
db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
_ = e.AddError(err)
return e
@@ -171,7 +171,7 @@ func (e *SysMenu) Remove(d *dto.SysMenuDeleteReq) *SysMenu {
var data models.SysMenu
db := e.Orm.Model(&data).Delete(&data, d.Ids)
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
_ = e.AddError(err)
+3 -3
View File
@@ -47,7 +47,7 @@ func (e *SysPost) Get(d *dto.SysPostGetReq, model *models.SysPost) error {
e.Log.Errorf("db error:%s", err)
return err
}
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -75,7 +75,7 @@ func (e *SysPost) Update(c *dto.SysPostUpdateReq) error {
c.Generate(&model)
db := e.Orm.Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -92,7 +92,7 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
var data models.SysPost
db := e.Orm.Model(&data).Delete(&data, d.GetId())
if db.Error != nil {
if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err)
return err
+4 -4
View File
@@ -153,7 +153,7 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
model.SysMenu = &mlist
db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -205,7 +205,7 @@ func (e *SysRole) Remove(c *dto.SysRoleDeleteReq, cb *casbin.SyncedEnforcer) err
tx.Preload("SysMenu").Preload("SysDept").First(&model, c.GetId())
db := tx.Select(clause.Associations).Delete(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
@@ -259,7 +259,7 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
c.Generate(&model)
model.SysDept = dlist
db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
_ = e.AddError(err)
return e
@@ -289,7 +289,7 @@ func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
tx.First(&model, c.GetId())
c.Generate(&model)
db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
if db.Error != nil {
if err = db.Error; err != nil {
e.Log.Errorf("db error:%s", err)
return err
}
+1 -1
View File
@@ -46,7 +46,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
db = db.WithContext(c).Scopes(
Permission(object.TableName(), p),
).Where(req.GetId()).Delete(object)
if db.Error != nil {
if err = db.Error; err != nil {
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
response.Error(c, 500, err, "删除失败")
return
+1 -1
View File
@@ -44,7 +44,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
db = db.WithContext(c).Scopes(
Permission(object.TableName(), p),
).Where(req.GetId()).Updates(object)
if db.Error != nil {
if err = db.Error; err != nil {
log.Errorf("MsgID[%s] Update error: %s", msgID, err)
response.Error(c, 500, err, "更新失败")
return