修复当字典没有详情列表时,删除字典提示失败的问题 (#976)

weiyunxiao · web-flow · commit 1c9302c61a26 · 2022-03-24T10:28:19.000+08:00
diff --git a/server/service/system/sys_dictionary.go b/server/service/system/sys_dictionary.go
@@ -44,7 +44,10 @@ func (dictionaryService *DictionaryService) DeleteSysDictionary(sysDictionary sy
 		return err
 	}
 
-	return global.GVA_DB.Model(&system.SysDictionaryDetail{}).Delete(sysDictionary.SysDictionaryDetails).Error
+	if sysDictionary.SysDictionaryDetails != nil {
+		return global.GVA_DB.Where("sys_dictionary_id=?", sysDictionary.ID).Delete(sysDictionary.SysDictionaryDetails).Error
+	}
+	return
 }
 
 //@author: [piexlmax](https://github.com/piexlmax)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,10 @@ func (dictionaryService *DictionaryService) DeleteSysDictionary(sysDictionary sy`
`44`	`44`	`return err`
`45`	`45`	`}`
`46`	`46`
`47`		`- return global.GVA_DB.Model(&system.SysDictionaryDetail{}).Delete(sysDictionary.SysDictionaryDetails).Error`
	`47`	`+ if sysDictionary.SysDictionaryDetails != nil {`
	`48`	`+ return global.GVA_DB.Where("sys_dictionary_id=?", sysDictionary.ID).Delete(sysDictionary.SysDictionaryDetails).Error`
	`49`	`+ }`
	`50`	`+ return`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`//@author: [piexlmax](https://github.com/piexlmax)`