mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-19 10:46:58 +08:00
fix: task filter by owner sql revisit (#22746)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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")))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user