diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 566e0ac..16ca0b1 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -223,10 +223,11 @@ export class AuthService {
         data: { revokedAt: new Date() },
       });
       await this.redis.del(this.permKey(record.tenantCode, record.userId));
+      const user = await this.prisma.client.user.findUnique({ where: { id: record.userId } });
       await this.recordAudit({
         tenantCode: record.tenantCode,
         userId: record.userId,
-        username: null,
+        username: user?.username ?? null,
         module: 'auth',
         action: 'logout',
         status: 'success',
diff --git a/src/common/base-crud.service.ts b/src/common/base-crud.service.ts
index 82c351c..8fd8490 100644
--- a/src/common/base-crud.service.ts
+++ b/src/common/base-crud.service.ts
@@ -53,7 +53,10 @@ export class BaseCrudService {
 
   async create(data: Record<string, unknown>) {
     const ctx = getRequestContext();
-    if (ctx && this.modelName !== 'tenant') data.tenantCode = ctx.tenantCode;
+    if (ctx && this.modelName !== 'tenant') {
+      data.tenantCode = ctx.tenantCode;
+      data.createdBy = ctx.userId;
+    }
     return this.db().create({ data });
   }