diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index ba23291..34c5733 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -152,6 +152,18 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       boolean result = userService.save(superAdmin);
       Integer superAdminUserId = superAdmin.getUserId();
 
+      // 更新 company 和 tenant 的 userId
+      if (superAdminUserId != null && superAdminUserId > 0) {
+        company.setUserId(superAdminUserId);
+        companyService.updateById(company);
+        // 同时更新 tenant 的 userId
+        Tenant tenant = baseMapper.selectById(company.getTid());
+        if (tenant != null) {
+          tenant.setUserId(superAdminUserId);
+          baseMapper.updateById(tenant);
+        }
+      }
+
       // 创建角色
       if (result) {
         Role role = new Role();