@mindbase/express-admin 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindbase/express-admin",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "exports": {
     ".": "./index.ts"
   },

package/service/UserService.ts

@@ -1,6 +1,7 @@
-import { eq, and, like, or, desc, count, isNull } from "drizzle-orm";
+import { eq, and, like, or, desc, count, isNull, sql } from "drizzle-orm";
 import { users } from "@mindbase/express-auth";
 import { md5 } from "@mindbase/express-auth";
+import { userRoles, roles } from "@mindbase/express-auth";
 
 let _db: any;
 
@@ -127,8 +128,42 @@ export async function listUsers(options: {
     .offset((page - 1) * pageSize)
     .execute();
 
+  // 查询用户角色关联
+  const userIds = list.map((u: any) => u.id);
+  const rolesData = userIds.length > 0
+    ? await db
+        .select({
+          userId: userRoles.userId,
+          roleId: roles.id,
+          roleName: roles.name,
+          roleCode: roles.code,
+        })
+        .from(userRoles)
+        .innerJoin(roles, eq(userRoles.roleId, roles.id))
+        .where(sql`${userRoles.userId} IN ${sql.raw(`(${userIds.join(',')})`)}`)
+        .execute()
+    : [];
+
+  // 组装角色数据
+  const userRolesMap: Record<number, any[]> = {};
+  rolesData.forEach((r: any) => {
+    if (!userRolesMap[r.userId]) {
+      userRolesMap[r.userId] = [];
+    }
+    userRolesMap[r.userId].push({
+      id: r.roleId,
+      name: r.roleName,
+      code: r.roleCode,
+    });
+  });
+
+  const listWithRoles = list.map((u: any) => ({
+    ...u,
+    roles: userRolesMap[u.id] || [],
+  }));
+
   return {
-    list,
+    list: listWithRoles,
     total,
     page,
     pageSize,