From 72a8a0a1ad6b79b8e9fb2facef121f9b5d584666 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期六, 08 二月 2025 10:56:30 +0800
Subject: [PATCH] 报表合并历史记录功能

---
 app/api/knowledge.py |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index 62762cb..c0e97ab 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -1,21 +1,22 @@
 # coding:utf-8
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Query, HTTPException
 from app.api import Response, get_current_user, ResponseList
 from app.models import RoleParameter, GroupModel, KnowledgeModel
 from app.models.base_model import get_db
 from app.models.user_model import UserModel
 from app.service.knowledge import get_knowledge_list
-
+from typing import Optional
 knowledge_router = APIRouter()
 
 @knowledge_router.get("/list", response_model=Response)
-async def knowledge_list(role:str="", current_user: UserModel = Depends(get_current_user),
-                          db=Depends(get_db)):
-    return Response(code=200, msg="", data = await get_knowledge_list(db, role, current_user.id))
+async def knowledge_list(
+        current: int,
+        pageSize: int,
+        current_user: UserModel = Depends(get_current_user),
+        db=Depends(get_db)):
+    if current and not pageSize:
+        return ResponseList(code=400, msg="缂哄皯鍙傛暟")
+    getknowledgelist = await get_knowledge_list(db, current_user.id, pageSize, current)
 
-
-@knowledge_router.get("/list", response_model=Response)
-async def knowledge_list(role:str="", current_user: UserModel = Depends(get_current_user),
-                          db=Depends(get_db)):
-    return Response(code=200, msg="", data = await get_knowledge_list(db, role, current_user.id))
\ No newline at end of file
+    return Response(code=200, msg="", data={"rows": getknowledgelist})

--
Gitblit v1.8.0