From c004b3d3334e1398759c3fcf41f164031eb6d4d2 Mon Sep 17 00:00:00 2001 From: zhaodongdong Date: Wed, 14 Sep 2022 17:42:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B:e.Log.Errorf("db=20error:%s",?= =?UTF-8?q?=20err)=E8=BE=93=E5=87=BA=E7=9A=84err=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A2=AB=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/sys_config.go | 2 +- app/admin/service/sys_dept.go | 6 +++--- app/admin/service/sys_dict_data.go | 4 ++-- app/admin/service/sys_dict_type.go | 6 +++--- app/admin/service/sys_login_log.go | 4 ++-- app/admin/service/sys_menu.go | 4 ++-- app/admin/service/sys_post.go | 6 +++--- app/admin/service/sys_role.go | 8 ++++---- common/actions/delete.go | 2 +- common/actions/update.go | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index a7a99f62..c21fe448 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -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 diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index 80fe0a77..e6dba54c 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -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 diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 28eedbad..553ad4c8 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -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 diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index 888bccb7..5d6ff2b8 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -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 diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index 04db57d7..985feb3e 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -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 diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 6779c740..01369085 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -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) diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index 99f1213b..51956f4e 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -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 diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index 8eeade1b..e8bd2d18 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -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 } diff --git a/common/actions/delete.go b/common/actions/delete.go index f98e1fb0..811b9bf9 100644 --- a/common/actions/delete.go +++ b/common/actions/delete.go @@ -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 diff --git a/common/actions/update.go b/common/actions/update.go index 3dd63b1e..70523345 100644 --- a/common/actions/update.go +++ b/common/actions/update.go @@ -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