From c5af1948768a6a359b4ac4c34575140559b13b0e Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 16 Dec 2025 10:42:31 +0800
Subject: [PATCH] BUGFIX

---
 src/main/java/com/ai/da/model/vo/AccountLoginVO.java      | 8 ++++++--
 .../java/com/ai/da/service/impl/AccountServiceImpl.java   | 2 ++
 .../ai/da/service/impl/SubscriptionPlanServiceImpl.java   | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
index e16b2ef1..d643f2cd 100644
--- a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
+++ b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
@@ -1,5 +1,5 @@
-package com.ai.da.model.vo;
-
+package com.ai.da.model.vo;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import com.ai.da.mapper.primary.entity.AccountExtend;
@@ -79,4 +79,8 @@ public class AccountLoginVO {
 
     private String givenName;
 
+    private Long organizationId;
+
+    private String organizationName;
+
 }
diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
index 85e931bf..4d8556f6 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -3175,6 +3175,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         }
 
         response.setUsernameModify(getNicknameModifyTimes());
+        response.setOrganizationId(account.getOrganizationId());
+        response.setOrganizationName(account.getOrganizationName());
         return response;
     }
 
diff --git a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
index 68748bd8..87d5f012 100644
--- a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
@@ -548,6 +548,7 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
         updateAccount.setCreditsUsage(plan.getCreditUsage());
         updateAccount.setCreditsUsageLimit(plan.getCreditLimit());
         updateAccount.setSubAccountNum(plan.getAccountNum());
+        updateAccount.setId(originalAccount.getId());
     }
 
     /**