Merge pull request #803 from zhanluxianshen/clean-err-use-in-method

clean err define in methods.
go-admin-team · Aug 29, 2024 · 9a8e0cd · 9a8e0cd
2 parents c0c1603 + 2d76430
commit 9a8e0cd
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go
@@ -143,7 +143,6 @@ func (e *SysConfig) Remove(d *dto.SysConfigDeleteReq) error {
 
 	db := e.Orm.Delete(&data, d.Ids)
 	if err = db.Error; err != nil {
-		err = db.Error
 		e.Log.Errorf("Service RemoveSysConfig error:%s", err)
 		return err
 	}
@@ -168,8 +167,7 @@ func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigB
 }
 
 func (e *SysConfig) GetWithKeyList(c *dto.SysConfigGetToSysAppReq, list *[]models.SysConfig) error {
-	var err error
-	err = e.Orm.
+	err := e.Orm.
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 		).

diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go
@@ -133,7 +133,6 @@ func (e *SysDept) Remove(d *dto.SysDeptDeleteReq) error {
 
 	db := e.Orm.Model(&data).Delete(&data, d.GetId())
 	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
@@ -92,7 +92,6 @@ func (e *SysDictData) Remove(c *dto.SysDictDataDeleteReq) error {
 
 	db := e.Orm.Delete(&data, c.GetId())
 	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
@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"fmt"
+
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
@@ -60,7 +61,7 @@ func (e *SysDictType) Insert(c *dto.SysDictTypeInsertReq) error {
 	var count int64
 	e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count)
 	if count > 0 {
-		return errors.New(fmt.Sprintf("当前字典类型[%s]已经存在！", data.DictType))
+		return fmt.Errorf("当前字典类型[%s]已经存在！", data.DictType)
 	}
 	err = e.Orm.Create(&data).Error
 	if err != nil {
@@ -95,7 +96,6 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeDeleteReq) error {
 
 	db := e.Orm.Delete(&data, d.GetId())
 	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
@@ -58,7 +58,6 @@ func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
 
 	db := e.Orm.Delete(&data, c.GetId())
 	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
@@ -192,7 +192,6 @@ func (e *SysMenu) Remove(d *dto.SysMenuDeleteReq) *SysMenu {
 
 	db := e.Orm.Model(&data).Delete(&data, d.Ids)
 	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
@@ -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 err = db.Error; err != nil {
+	if err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -93,7 +93,6 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 
 	db := e.Orm.Model(&data).Delete(&data, d.GetId())
 	if err = db.Error; err != nil {
-		err = db.Error
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}
@@ -102,4 +101,4 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 		return err
 	}
 	return nil
-}
+}