public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean err define in methods.

Browse Source 
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
This commit is contained in:
zhanluxianshen
2024-07-10 15:03:33 +08:00
parent 93f25c6cdf
commit 2d76430f89
7 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/sys_config.go
+1 -3
View File
@@ -143,7 +143,6 @@ func (e *SysConfig) Remove(d *dto.SysConfigDeleteReq) error {
db := e.Orm.Delete(&data, d.Ids) db := e.Orm.Delete(&data, d.Ids)
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Service RemoveSysConfig error:%s", err) e.Log.Errorf("Service RemoveSysConfig error:%s", err)
return 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 { func (e *SysConfig) GetWithKeyList(c *dto.SysConfigGetToSysAppReq, list *[]models.SysConfig) error {
var err error err := e.Orm.
err = e.Orm.
Scopes( Scopes(
cDto.MakeCondition(c.GetNeedSearch()), cDto.MakeCondition(c.GetNeedSearch()),
). ).
app/admin/service/sys_dept.go
-1
View File
@@ -133,7 +133,6 @@ func (e *SysDept) Remove(d *dto.SysDeptDeleteReq) error {
db := e.Orm.Model(&data).Delete(&data, d.GetId()) db := e.Orm.Model(&data).Delete(&data, d.GetId())
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
return err return err
} }
app/admin/service/sys_dict_data.go
-1
View File
@@ -92,7 +92,6 @@ func (e *SysDictData) Remove(c *dto.SysDictDataDeleteReq) error {
db := e.Orm.Delete(&data, c.GetId()) db := e.Orm.Delete(&data, c.GetId())
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
return err return err
} }
app/admin/service/sys_dict_type.go
+2 -2
View File
@@ -3,6 +3,7 @@ package service
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/go-admin-team/go-admin-core/sdk/service" "github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm" "gorm.io/gorm"
@@ -60,7 +61,7 @@ func (e *SysDictType) Insert(c *dto.SysDictTypeInsertReq) error {
var count int64 var count int64
e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count) e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count)
if count > 0 { if count > 0 {
return errors.New(fmt.Sprintf("当前字典类型[%s]已经存在！", data.DictType)) return fmt.Errorf("当前字典类型[%s]已经存在！", data.DictType)
} }
err = e.Orm.Create(&data).Error err = e.Orm.Create(&data).Error
if err != nil { if err != nil {
@@ -95,7 +96,6 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeDeleteReq) error {
db := e.Orm.Delete(&data, d.GetId()) db := e.Orm.Delete(&data, d.GetId())
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
return err return err
} }
app/admin/service/sys_login_log.go
-1
View File
@@ -58,7 +58,6 @@ func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
db := e.Orm.Delete(&data, c.GetId()) db := e.Orm.Delete(&data, c.GetId())
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
return err return err
} }
app/admin/service/sys_menu.go
-1
View File
@@ -192,7 +192,6 @@ func (e *SysMenu) Remove(d *dto.SysMenuDeleteReq) *SysMenu {
db := e.Orm.Model(&data).Delete(&data, d.Ids) db := e.Orm.Model(&data).Delete(&data, d.Ids)
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
_ = e.AddError(err) _ = e.AddError(err)
} }
app/admin/service/sys_post.go
+2 -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) e.Log.Errorf("db error:%s", err)
return err return err
} }
if err = db.Error; err != nil { if err != nil {
e.Log.Errorf("db error:%s", err) e.Log.Errorf("db error:%s", err)
return err return err
} }
@@ -93,7 +93,6 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
db := e.Orm.Model(&data).Delete(&data, d.GetId()) db := e.Orm.Model(&data).Delete(&data, d.GetId())
if err = db.Error; err != nil { if err = db.Error; err != nil {
err = db.Error
e.Log.Errorf("Delete error: %s", err) e.Log.Errorf("Delete error: %s", err)
return err return err
} }
@@ -102,4 +101,4 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
return err return err
} }
return nil return nil
} }