fix: task filter by owner sql revisit (#22746)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2025-06-20 16:06:27 +08:00
committed by GitHub
co-authored by Qiu Jian
parent b6b5c6041b
commit d9c5d5657e
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -281,6 +281,11 @@ func listItemQueryFiltersRaw(
}
}
q, err = ListItemFilter(manager, ctx, q, userCred, query)
if err != nil {
return nil, errors.Wrap(err, "ListItemFilter")
}
// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
// TURN ON automatic filter by column name, ONLY if query key starts with @!!!!
// example: @name=abc&@city=111
@@ -312,10 +317,6 @@ func listItemQueryFiltersRaw(
return nil, errors.Wrap(err, "applyListItemsGeneralJointFilters")
}
}
q, err = ListItemFilter(manager, ctx, q, userCred, query)
if err != nil {
return nil, errors.Wrap(err, "ListItemFilter")
}
if !useRawQuery {
// Specifically for joint resource, these filters will exclude
+1 -1
View File
@@ -173,7 +173,7 @@ func (manager *STaskManager) FilterByOwner(ctx context.Context, q *sqlchemy.SQue
taskQ = taskQ.Snapshot()
taskQ = manager.SProjectizedResourceBaseManager.FilterByOwner(ctx, taskQ, man, userCred, owner, scope)
if taskQ.IsAltered() {
taskSubQ := taskQ.Distinct().SubQuery()
taskSubQ := taskQ.SubQuery()
q = q.Join(taskSubQ, sqlchemy.Equals(q.Field("id"), taskSubQ.Field("task_id")))
}