Browse Source

Merge pull request 'fix-476' (#571) from fix-558 into V20211101

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/571
Reviewed-by: lewis <747342561@qq.com>
pull/574/head
lewis 3 years ago
parent
commit
d6ac998e9c
1 changed files with 8 additions and 1 deletions
  1. +8
    -1
      models/dataset.go

+ 8
- 1
models/dataset.go View File

@@ -139,7 +139,14 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
if opts.IncludePublic { if opts.IncludePublic {
cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic}) cond = cond.And(builder.Eq{"dataset.status": DatasetStatusPublic})
if opts.OwnerID > 0 { if opts.OwnerID > 0 {
cond = cond.Or(builder.Eq{"repository.owner_id": opts.OwnerID})
if len(opts.Keyword) == 0 {
cond = cond.Or(builder.Eq{"repository.owner_id": opts.OwnerID})
} else {
subCon := builder.NewCond()
subCon = subCon.And(builder.Eq{"repository.owner_id": opts.OwnerID}, builder.Like{"dataset.title", opts.Keyword})
cond = cond.Or(subCon)

}
} }
} else if opts.OwnerID > 0 { } else if opts.OwnerID > 0 {
cond = cond.And(builder.Eq{"repository.owner_id": opts.OwnerID}) cond = cond.And(builder.Eq{"repository.owner_id": opts.OwnerID})


Loading…
Cancel
Save