Skip to content

Commit c67d89d

Browse files
committed
[fix]: 文件树返回文献Tag
1 parent eec0b1a commit c67d89d

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

app/curd/article.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,16 @@ async def crud_self_tree(user_id: int, page_number: int, page_size: int, db: Asy
211211
query = select(Article).where(Article.folder_id == folder_array[i].get("folder_id"), Article.visible == True).order_by(Article.id.desc())
212212
result = await db.execute(query)
213213
articles = result.scalars().all()
214-
article_array = [{"article_id": article.id, "article_name": article.name, "notes": []} for article in articles]
214+
article_array = [{"article_id": article.id, "article_name": article.name, "tags": [], "notes": []} for article in articles]
215215
folder_array[i]["articles"] = article_array
216216
for j in range(len(article_array)):
217+
# 查找所有tag
218+
query = select(Tag).where(Tag.article_id == article_array[j].get("article_id")).order_by(Tag.id.asc())
219+
result = await db.execute(query)
220+
tags = result.scalars().all()
221+
tag_array = [{"tag_id": tag.id, "tag_content": tag.content} for tag in tags]
222+
article_array[j]["tags"] = tag_array
223+
# 查找所有note
217224
query = select(Note).where(Note.article_id == article_array[j].get("article_id"), Note.visible == True).order_by(Note.id.desc())
218225
result = await db.execute(query)
219226
notes = result.scalars().all()

0 commit comments

Comments
 (0)