Skip to content

Commit d1636b1

Browse files
author
奇淼(piexlmax
authored
Merge pull request flipped-aurora#888 from songzhibin97/v2.4.x-
fix:flipped-aurora#887
2 parents d586ca5 + e7e9fd7 commit d1636b1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

server/service/system/sys_dictionary.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,19 @@ func (dictionaryService *DictionaryService) CreateSysDictionary(sysDictionary sy
3232
//@return: err error
3333

3434
func (dictionaryService *DictionaryService) DeleteSysDictionary(sysDictionary system.SysDictionary) (err error) {
35-
err = global.GVA_DB.Delete(&sysDictionary).Delete(&sysDictionary.SysDictionaryDetails).Error
36-
return err
35+
err = global.GVA_DB.Where("id = ?", sysDictionary.ID).Preload("SysDictionaryDetails").First(&sysDictionary).Error
36+
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
37+
return errors.New("请不要搞事")
38+
}
39+
if err != nil {
40+
return err
41+
}
42+
err = global.GVA_DB.Delete(&sysDictionary).Error
43+
if err != nil {
44+
return err
45+
}
46+
47+
return global.GVA_DB.Model(&system.SysDictionaryDetail{}).Delete(sysDictionary.SysDictionaryDetails).Error
3748
}
3849

3950
//@author: [piexlmax](https://github.com/piexlmax)

0 commit comments

Comments
 (0)