xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-11-12 00:53:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 渠道多分组，优化分组 like 查询

Browse Source
This commit is contained in:
FENG
2024-08-05 22:35:16 +08:00
parent 67878731fc
commit 190316f66e
2 changed files with 404 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
model/channel.go
View File

@@ -90,13 +90,11 @@ func GetAllChannels(startIdx int, num int, selectAll bool, idSort bool) ([]*Chan
func SearchChannels(keyword string, group string, model string) ([]*Channel, error) { func SearchChannels(keyword string, group string, model string) ([]*Channel, error) {
var channels []*Channel var channels []*Channel
keyCol := "`key`" keyCol := "`key`"
groupCol := "`group`"
modelsCol := "`models`" modelsCol := "`models`"
// 如果是 PostgreSQL，使用双引号 // 如果是 PostgreSQL，使用双引号
if common.UsingPostgreSQL { if common.UsingPostgreSQL {
keyCol = `"key"` keyCol = `"key"`
groupCol = `"group"`
modelsCol = `"models"` modelsCol = `"models"`
} }
@@ -106,9 +104,9 @@ func SearchChannels(keyword string, group string, model string) ([]*Channel, err
// 构造WHERE子句 // 构造WHERE子句
var whereClause string var whereClause string
var args []interface{} var args []interface{}
if group != "" { if group != "" && group != "null" {
whereClause = "(id = ? OR name LIKE ? OR " + keyCol + " = ?) AND " + groupCol + " = ? AND " + modelsCol + " LIKE ?" whereClause = "(id = ? OR name LIKE ? OR " + keyCol + " = ?) AND " + modelsCol + ` LIKE ? AND (',' || "group" || ',') LIKE ?`
args = append(args, common.String2Int(keyword), "%"+keyword+"%", keyword, group, "%"+model+"%") args = append(args, common.String2Int(keyword), "%"+keyword+"%", keyword, "%"+model+"%", "%,"+group+",%")
} else { } else {
whereClause = "(id = ? OR name LIKE ? OR " + keyCol + " = ?) AND " + modelsCol + " LIKE ?" whereClause = "(id = ? OR name LIKE ? OR " + keyCol + " = ?) AND " + modelsCol + " LIKE ?"
args = append(args, common.String2Int(keyword), "%"+keyword+"%", keyword, "%"+model+"%") args = append(args, common.String2Int(keyword), "%"+keyword+"%", keyword, "%"+model+"%")

3
web/src/components/ChannelsTable.js
View File

@@ -745,7 +745,8 @@ const ChannelsTable = () => {
<Form.Select <Form.Select
field='group' field='group'
label='分组' label='分组'
optionList={groupOptions} optionList={[{ label: '选择分组', value: null}, ...groupOptions]}
initValue={null}
onChange={(v) => { onChange={(v) => {
setSearchGroup(v); setSearchGroup(v);
searchChannels(searchKeyword, v, searchModel); searchChannels(searchKeyword, v, searchModel);