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

fix: get all memory in team with permission=me (#16593)

Browse Source 
### Summary

As title:
This commit is contained in:
Haruko386
2026-07-03 18:25:04 +08:00
committed by GitHub
parent 706fa4e87a
commit 488574fd80
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/memory.go
View File

@@ -301,7 +301,7 @@ func (dao *MemoryDAO) GetWithOwnerNameByID(id string) (*entity.MemoryListItem, e
// Example:
//
// memories, total, err := dao.GetByFilter([]string{"tenant1"}, []string{"semantic"}, "table", "test", 1, 10)
func (dao *MemoryDAO) GetByFilter(tenantIDs []string, memoryTypes []string, storageType string, keywords string, page int, pageSize int) ([]*entity.MemoryListItem, int64, error) {
func (dao *MemoryDAO) GetByFilter(userID string, tenantIDs []string, memoryTypes []string, storageType string, keywords string, page int, pageSize int) ([]*entity.MemoryListItem, int64, error) {
var conditions []string
var args []interface{}
@@ -310,6 +310,11 @@ func (dao *MemoryDAO) GetByFilter(tenantIDs []string, memoryTypes []string, stor
args = append(args, tenantIDs)
}
if userID != "" {
conditions = append(conditions, "(m.tenant_id = ? OR m.permissions = ?)")
args = append(args, userID, "team")
}
if len(memoryTypes) > 0 {
memoryTypeInt := CalculateMemoryType(memoryTypes)
conditions = append(conditions, "m.memory_type & ? > 0")

9
internal/service/memory.go
View File

@@ -1419,13 +1419,14 @@ func (s *MemoryService) ListMemories(userID string, tenantIDs []string, memoryTy
if err != nil {
return nil, fmt.Errorf("failed to get user tenants: %w", err)
}
tenantIDs = make([]string, len(userTenants))
for i, tenant := range userTenants {
tenantIDs[i] = tenant.TenantID
tenantIDs = make([]string, 0, len(userTenants)+1)
tenantIDs = append(tenantIDs, userID)
for _, tenant := range userTenants {
tenantIDs = append(tenantIDs, tenant.TenantID)
}
}
memories, total, err := s.memoryDAO.GetByFilter(tenantIDs, memoryTypes, storageType, keywords, page, pageSize)
memories, total, err := s.memoryDAO.GetByFilter(userID, tenantIDs, memoryTypes, storageType, keywords, page, pageSize)
if err != nil {
return nil, err
}