diff --git a/backend/app/controller/ApprovalController.php b/backend/app/controller/ApprovalController.php index 150f2a2..9573b19 100644 --- a/backend/app/controller/ApprovalController.php +++ b/backend/app/controller/ApprovalController.php @@ -38,8 +38,13 @@ class ApprovalController extends BaseController $page = (int) $request->get('page', 1); $pageSize = (int) $request->get('page_size', 20); + // 添加日志 + error_log("Approval list request: userId={$userId}, type={$type}, page={$page}"); + $result = $this->service->getList($userId, $type, $page, $pageSize); + error_log("Approval list result: count=" . count($result['list'])); + return $this->success($result); } diff --git a/frontend/src/pages/approval/list.tsx b/frontend/src/pages/approval/list.tsx index dd1f099..651b05d 100644 --- a/frontend/src/pages/approval/list.tsx +++ b/frontend/src/pages/approval/list.tsx @@ -56,6 +56,8 @@ export default function ApprovalList() { const loadData = async (pageNum: number = 1, isRefresh: boolean = false) => { if (loading) return + console.log('🔍 Loading approval list:', { activeTab, pageNum, isRefresh }) + setLoading(true) try { const result = await approvalApi.getList({ @@ -64,6 +66,25 @@ export default function ApprovalList() { page_size: 20, }) + console.log('📦 API response:', { type: activeTab, result }) + + const newList = result.list || [] + + if (isRefresh || pageNum === 1) { + setList(newList) + } else { + setList([...list, ...newList]) + } + + setHasMore(newList.length >= 20) + setPage(pageNum) + } catch (error: any) { + console.error('Failed to load approvals:', error) + } finally { + setLoading(false) + } + } + const newList = result.list || [] if (isRefresh || pageNum === 1) {