From c41f4efc048b88781ddfd83330867645c4fb3637 Mon Sep 17 00:00:00 2001
From: ZhenYi <434836402@qq.com>
Date: Wed, 22 Apr 2026 20:53:22 +0800
Subject: [PATCH] fix(admin): workspace_billing_history user column + rbac
 listUsers pagination params order

---
 .../platform/workspaces/[id]/add-credit/route.ts  |  2 +-
 admin/src/lib/rbac.ts                             | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/admin/src/app/api/platform/workspaces/[id]/add-credit/route.ts b/admin/src/app/api/platform/workspaces/[id]/add-credit/route.ts
index c1bfc40..a3b1a51 100644
--- a/admin/src/app/api/platform/workspaces/[id]/add-credit/route.ts
+++ b/admin/src/app/api/platform/workspaces/[id]/add-credit/route.ts
@@ -66,7 +66,7 @@ export async function POST(
       // Insert billing history
       await client.query(
         `INSERT INTO workspace_billing_history
-           (workspace_id, user, amount, reason, extra, currency)
+           (workspace_id, user_id, amount, reason, extra, currency)
          VALUES ($1, NULL, $2, 'admin_credit', $3, $4)`,
         [id, amount, JSON.stringify({ description: description || "Admin 手动充值" }), currency]
       );
diff --git a/admin/src/lib/rbac.ts b/admin/src/lib/rbac.ts
index 75ba751..174298e 100644
--- a/admin/src/lib/rbac.ts
+++ b/admin/src/lib/rbac.ts
@@ -201,15 +201,12 @@ export async function listUsers(
   const pageSize = options.pageSize ?? 20;
   const offset = (page - 1) * pageSize;
 
-  const params: unknown[] = [pageSize, offset];
-  let whereClause = "";
-  let paramIdx = 3;
-
-  if (options.search) {
-    whereClause = `WHERE username ILIKE $1`;
-    params.unshift(`%${options.search}%`);
-    paramIdx = 3;
-  }
+  const params: unknown[] = [
+    ...(options.search ? [`%${options.search}%`] : []),
+    pageSize,
+    offset,
+  ];
+  const whereClause = options.search ? `WHERE username ILIKE $1` : "";
 
   const countParams = options.search ? [`%${options.search}%`] : [];
   const countResult = await query<{ count: string }>(