From c67d89ddf7fd207307debeffccadd798201d950d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=98=95=E7=9D=BF?= <22371298@buaa.edu.cn> Date: Mon, 5 May 2025 21:07:15 +0800 Subject: [PATCH] =?UTF-8?q?[fix]:=20=E6=96=87=E4=BB=B6=E6=A0=91=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=96=87=E7=8C=AETag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/curd/article.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/curd/article.py b/app/curd/article.py index 3be59b0..49c140e 100644 --- a/app/curd/article.py +++ b/app/curd/article.py @@ -211,9 +211,16 @@ async def crud_self_tree(user_id: int, page_number: int, page_size: int, db: Asy query = select(Article).where(Article.folder_id == folder_array[i].get("folder_id"), Article.visible == True).order_by(Article.id.desc()) result = await db.execute(query) articles = result.scalars().all() - article_array = [{"article_id": article.id, "article_name": article.name, "notes": []} for article in articles] + article_array = [{"article_id": article.id, "article_name": article.name, "tags": [], "notes": []} for article in articles] folder_array[i]["articles"] = article_array for j in range(len(article_array)): + # 查找所有tag + query = select(Tag).where(Tag.article_id == article_array[j].get("article_id")).order_by(Tag.id.asc()) + result = await db.execute(query) + tags = result.scalars().all() + tag_array = [{"tag_id": tag.id, "tag_content": tag.content} for tag in tags] + article_array[j]["tags"] = tag_array + # 查找所有note query = select(Note).where(Note.article_id == article_array[j].get("article_id"), Note.visible == True).order_by(Note.id.desc()) result = await db.execute(query) notes = result.scalars().all()