zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-29 12:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: agent list owner filter not applied (#17410)

Browse Source
This commit is contained in:
euvre
2026-07-27 13:58:43 +08:00
committed by GitHub
parent 9bec8d12bb
commit 6cc862fc00
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/db/services/canvas_service.py
View File

@@ -148,21 +148,18 @@ class UserCanvasService(CommonService):
cls.model.canvas_category,
cls.model.tags,
]
owner_filter = cls.model.user_id.in_(joined_tenant_ids) & ((cls.model.permission == TenantPermission.TEAM.value) | (cls.model.user_id == user_id))
if keywords:
agents = (
cls.model.select(*fields)
.join(User, on=(cls.model.user_id == User.id))
.where(
(((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id)),
owner_filter,
(fn.LOWER(cls.model.title).contains(keywords.lower())),
)
)
else:
agents = (
cls.model.select(*fields)
.join(User, on=(cls.model.user_id == User.id))
.where((((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id)))
)
agents = cls.model.select(*fields).join(User, on=(cls.model.user_id == User.id)).where(owner_filter)
if canvas_category:
agents = agents.where(cls.model.canvas_category == canvas_category)
if canvas_type:

36
internal/dao/user_canvas.go
View File

@@ -357,28 +357,24 @@ func (dao *UserCanvasDAO) ListByTenantIDs(ownerIDs []string, userID string, page
// Canvases owned by any of the ownerIDs that are "team"-permission, plus all owned by userID.
base := DB.Model(&entity.UserCanvas{}).
Select(`user_canvas.id,
user_canvas.avatar,
user_canvas.title,
user_canvas.description,
user_canvas.permission,
user_canvas.user_id,
user_canvas.user_id AS tenant_id,
user.nickname,
user.avatar AS tenant_avatar,
user_canvas.canvas_type,
user_canvas.canvas_category,
user_canvas.tags,
user_canvas.create_time,
user_canvas.update_time`).
user_canvas.avatar,
user_canvas.title,
user_canvas.description,
user_canvas.permission,
user_canvas.user_id,
user_canvas.user_id AS tenant_id,
user.nickname,
user.avatar AS tenant_avatar,
user_canvas.canvas_type,
user_canvas.canvas_category,
user_canvas.tags,
user_canvas.create_time,
user_canvas.update_time`).
Joins("LEFT JOIN user ON user_canvas.user_id = user.id").
Where("user_canvas.user_id IN ?", ownerIDs).
Where(
DB.Where("user_canvas.user_id IN ? AND user_canvas.permission = ?", ownerIDs, "team").
Or("user_canvas.user_id = ?", userID),
"user_canvas.user_id IN ?",
ownerIDs,
).Where(
DB.Where("user_canvas.permission = ?", "team").
Or("user_canvas.user_id = ?", userID))
DB.Where("user_canvas.permission = ?", "team").
Or("user_canvas.user_id = ?", userID))
if canvasCategory != "" {
base = base.Where("user_canvas.canvas_category = ?", canvasCategory)