From 1c6af4a5fa7af618cd7cbad92d88c9464ee4b819 Mon Sep 17 00:00:00 2001
From: COOL <team@cool-js.com>
Date: Wed, 5 Mar 2025 13:53:25 +0800
Subject: [PATCH] fix app login

---
 src/modules/user/service/login.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/user/service/login.ts b/src/modules/user/service/login.ts
index 6b6102e..440e5a9 100644
--- a/src/modules/user/service/login.ts
+++ b/src/modules/user/service/login.ts
@@ -229,7 +229,6 @@ export class UserLoginService extends BaseService {
         nickName: wxUserInfo.nickName,
         avatarUrl,
         gender: wxUserInfo.gender,
-        tenantId: userInfo['tenantId'],
         loginType: wxUserInfo.type,
       };
       await this.userInfoEntity.insert(userInfo);
@@ -297,9 +296,11 @@ export class UserLoginService extends BaseService {
    */
   async generateToken(info, isRefresh = false) {
     const { expire, refreshExpire, secret } = this.jwtConfig;
+    const user = await this.userInfoEntity.findOneBy({ id: Equal(info.id) });
     const tokenInfo = {
       isRefresh,
       ...info,
+      tenantId: user?.tenantId,
     };
     return jwt.sign(tokenInfo, secret, {
       expiresIn: isRefresh ? refreshExpire : expire,