red-future/model-gateway
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复模型查询条件为空时的异常行为

Browse Source
This commit is contained in:
曲皓东
2026-05-29 18:06:50 +08:00
parent d409b84b58
commit 558fd49ec1
1 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
dao/model_dao.go
View File

@@ -2,10 +2,12 @@ package dao
import (
"context"
"fmt"
"model-gateway/consts/public"
"model-gateway/model/dto"
"model-gateway/model/entity"
"strconv"
"strings"
"gitea.com/red-future/common/db/gfdb"
"github.com/gogf/gf/v2/frame/g"
@@ -58,17 +60,49 @@ func (d *modelDao) Delete(ctx context.Context, req *entity.AsynchModel) (rows in
// Get 按ID获取（带租户隔离，只查当前租户）
func (d *modelDao) Get(ctx context.Context, req *entity.AsynchModel, fields ...string) (m *entity.AsynchModel, err error) {
r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameModel).
OmitEmpty().
Where(entity.AsynchModelCol.Id, req.Id).
Where(entity.AsynchModelCol.Creator, req.Creator).
Where(entity.AsynchModelCol.IsChatModel, req.IsChatModel).
Where(entity.AsynchModelCol.ModelName, req.ModelName).
Fields(fields).One()
//r, err := gfdb.DB(ctx, public.DbNameModelGateway).Model(ctx, public.TableNameModel).
// OmitEmpty().
// Where(entity.AsynchModelCol.Id, req.Id).
// Where(entity.AsynchModelCol.Creator, req.Creator).
// Where(entity.AsynchModelCol.IsChatModel, req.IsChatModel).
// Where(entity.AsynchModelCol.ModelName, req.ModelName).
// Fields(fields).One()
//if err != nil {
// return
//}
//err = r.Struct(&m)
var whereCondition strings.Builder
var queryParams []interface{}
if !g.IsEmpty(req.Id) {
whereCondition.WriteString(fmt.Sprintf(" AND %s = (?) ", entity.AsynchModelCol.Id))
queryParams = append(queryParams, req.Id)
}
if !g.IsEmpty(req.Creator) {
whereCondition.WriteString(fmt.Sprintf(" AND %s = (?) ", entity.AsynchModelCol.Creator))
queryParams = append(queryParams, req.Creator)
}
if !g.IsEmpty(req.IsChatModel) {
whereCondition.WriteString(fmt.Sprintf(" AND %s = (?) ", entity.AsynchModelCol.IsChatModel))
queryParams = append(queryParams, req.IsChatModel)
}
if !g.IsEmpty(req.ModelName) {
whereCondition.WriteString(fmt.Sprintf(" AND %s = (?) ", entity.AsynchModelCol.ModelName))
queryParams = append(queryParams, req.ModelName)
}
// 完整 SQL
sql := `SELECT * FROM "asynch_models" WHERE "deleted_at" IS NULL` + whereCondition.String()
r, err := gfdb.DB(ctx, public.DbNameModelGateway).GetAll(ctx, sql, queryParams...)
if err != nil {
return
}
err = r.Struct(&m)
var i []*entity.AsynchModel
if err = r.Structs(&i); err != nil {
return nil, err
}
for _, item := range i {
m = item
}
return
}