fix: search channel #442
This commit is contained in:
@@ -105,7 +105,7 @@ func GetChannelsByTag(tag string) ([]*Channel, error) {
|
|||||||
return channels, err
|
return channels, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func SearchChannels(keyword string, group string, model string) ([]*Channel, error) {
|
func SearchChannels(keyword string, group string, model string, idSort bool) ([]*Channel, error) {
|
||||||
var channels []*Channel
|
var channels []*Channel
|
||||||
keyCol := "`key`"
|
keyCol := "`key`"
|
||||||
groupCol := "`group`"
|
groupCol := "`group`"
|
||||||
@@ -118,6 +118,11 @@ func SearchChannels(keyword string, group string, model string) ([]*Channel, err
|
|||||||
modelsCol = `"models"`
|
modelsCol = `"models"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
order := "priority desc"
|
||||||
|
if idSort {
|
||||||
|
order = "id desc"
|
||||||
|
}
|
||||||
|
|
||||||
// 构造基础查询
|
// 构造基础查询
|
||||||
baseQuery := DB.Model(&Channel{}).Omit(keyCol)
|
baseQuery := DB.Model(&Channel{}).Omit(keyCol)
|
||||||
|
|
||||||
@@ -140,7 +145,7 @@ func SearchChannels(keyword string, group string, model string) ([]*Channel, err
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 执行查询
|
// 执行查询
|
||||||
err := baseQuery.Where(whereClause, args...).Order("priority desc").Find(&channels).Error
|
err := baseQuery.Where(whereClause, args...).Order(order).Find(&channels).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user