diff --git a/models/config.go b/models/config.go index 4ae6783..e040ddc 100644 --- a/models/config.go +++ b/models/config.go @@ -1,6 +1,7 @@ package models import ( + "errors" orm "go-admin/database" "go-admin/tools" _ "time" @@ -27,6 +28,12 @@ func (SysConfig) TableName() string { // Config 创建 func (e *SysConfig) Create() (SysConfig, error) { var doc SysConfig + i := 0 + orm.Eloquent.Table(e.TableName()).Where("config_name=? or config_key = ?", e.ConfigName, e.ConfigKey).Count(&i) + if i > 0 { + return doc, errors.New("参数名称或者参数键名已经存在!") + } + result := orm.Eloquent.Table(e.TableName()).Create(&e) if result.Error != nil { err := result.Error @@ -80,7 +87,7 @@ func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, erro if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } @@ -89,6 +96,14 @@ func (e *SysConfig) Update(id int) (update SysConfig, err error) { return } + if e.ConfigName != "" && e.ConfigName != update.ConfigName { + return update, errors.New("参数名称不允许修改!") + } + + if e.ConfigKey != "" && e.ConfigKey != update.ConfigKey { + return update, errors.New("参数键名不允许修改!") + } + //参数1:是要修改的数据 //参数2:是修改的数据 if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { diff --git a/models/dictData.go b/models/dictData.go index b945eb3..ebde707 100644 --- a/models/dictData.go +++ b/models/dictData.go @@ -1,6 +1,7 @@ package models import ( + "errors" orm "go-admin/database" "go-admin/tools" ) @@ -30,6 +31,13 @@ func (DictData) TableName() string { func (e *DictData) Create() (DictData, error) { var doc DictData + + i := 0 + orm.Eloquent.Table(e.TableName()).Where("dict_label=? or dict_value = ?", e.DictLabel, e.DictValue).Count(&i) + if i > 0 { + return doc, errors.New("字典标签或者字典键值已经存在!") + } + result := orm.Eloquent.Table(e.TableName()).Create(&e) if result.Error != nil { err := result.Error @@ -106,7 +114,7 @@ func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error) if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } @@ -115,6 +123,14 @@ func (e *DictData) Update(id int) (update DictData, err error) { return } + if e.DictLabel != "" && e.DictLabel != update.DictLabel { + return update, errors.New("标签不允许修改!") + } + + if e.DictValue != "" && e.DictValue != update.DictValue { + return update, errors.New("键值不允许修改!") + } + //参数1:是要修改的数据 //参数2:是修改的数据 if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { diff --git a/models/dictType.go b/models/dictType.go index 28c88a5..6f5c0d7 100644 --- a/models/dictType.go +++ b/models/dictType.go @@ -1,6 +1,7 @@ package models import ( + "errors" orm "go-admin/database" "go-admin/tools" ) @@ -24,6 +25,13 @@ func (DictType) TableName() string { func (e *DictType) Create() (DictType, error) { var doc DictType + + i := 0 + orm.Eloquent.Table(e.TableName()).Where("dict_name=? or dict_type = ?", e.DictName, e.DictType).Count(&i) + if i > 0 { + return doc, errors.New("字典名称或者字典类型已经存在!") + } + result := orm.Eloquent.Table(e.TableName()).Create(&e) if result.Error != nil { err := result.Error @@ -94,7 +102,7 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error) if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } @@ -103,6 +111,14 @@ func (e *DictType) Update(id int) (update DictType, err error) { return } + if e.DictName != "" && e.DictName != update.DictName { + return update, errors.New("名称不允许修改!") + } + + if e.DictType != "" && e.DictType != update.DictType { + return update, errors.New("类型不允许修改!") + } + //参数1:是要修改的数据 //参数2:是修改的数据 if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil {