修复字典按ID排序而非sort排序问题 (flipped-aurora#1387)

Albort-z · web-flow · commit 40f77db461a2 · 2023-03-25T20:04:05.000+08:00
直接使用Preload加载的字典值是按ID排序的，在前端展示时并非希望的sort排序
diff --git a/server/service/system/sys_dictionary.go b/server/service/system/sys_dictionary.go
@@ -87,7 +87,9 @@ func (dictionaryService *DictionaryService) GetSysDictionary(Type string, Id uin
 	} else {
 		flag = *status
 	}
-	err = global.GVA_DB.Where("(type = ? OR id = ?) and status = ?", Type, Id, flag).Preload("SysDictionaryDetails", "status = ?", true).First(&sysDictionary).Error
+	err = global.GVA_DB.Where("(type = ? OR id = ?) and status = ?", Type, Id, flag).Preload("SysDictionaryDetails", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = ?", true).Order("sort")
+	}).First(&sysDictionary).Error
 	return
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,9 @@ func (dictionaryService *DictionaryService) GetSysDictionary(Type string, Id uin`
`87`	`87`	`} else {`
`88`	`88`	`flag = *status`
`89`	`89`	`}`
`90`		`- err = global.GVA_DB.Where("(type = ? OR id = ?) and status = ?", Type, Id, flag).Preload("SysDictionaryDetails", "status = ?", true).First(&sysDictionary).Error`
	`90`	`+ err = global.GVA_DB.Where("(type = ? OR id = ?) and status = ?", Type, Id, flag).Preload("SysDictionaryDetails", func(db gorm.DB) gorm.DB {`
	`91`	`+ return db.Where("status = ?", true).Order("sort")`
	`92`	`+ }).First(&sysDictionary).Error`
`91`	`93`	`return`
`92`	`94`	`}`
`93`	`95`