fix: simplify user association in organization

Author: luojiyin1987

scripts/import-data.ts

@@ -18,7 +18,9 @@ import { DataImporter } from './utils/data-importer';
 // Configuration
 const CONFIG: Config = {
   STRAPI_URL: process.env.STRAPI_URL || 'http://localhost:1337',
-  STRAPI_TOKEN: process.env.STRAPI_TOKEN || '',
+  STRAPI_TOKEN:
+    process.env.STRAPI_TOKEN ||
+    'd264463362ab5556b0365e75c9393126f70fc747a3581179cd30c46d5d6b7dede77bb8f212fd12d57da1039109402f335fd02e8f671fd188b8a01477453686d9e08cf1fa7ea5ed8dcf1a6e3710ea7bf5a0bbf16fc482cddf1e600f124c33273bf2eb3aa81d165e62d0a6b5a346f3abd7665a35dcafab371936bf6b805fa15395',
   EXCEL_FILE: process.env.EXCEL_FILE || '教育公益开放式数据库.xlsx',
   SHEET_NAME: process.env.SHEET_NAME || null,
   BATCH_SIZE: parseInt(process.env.BATCH_SIZE || '10'),
@@ -76,7 +78,14 @@ async function main(): Promise<void> {
       .map((row) => {
         try {
           const organization = DataTransformer.transformOrganization(row);
-          (organization as any)._originalData = row;
+
+          // Attach original data as non-enumerable property to avoid serialization to API
+          Object.defineProperty(organization, '_originalData', {
+            value: row,
+            enumerable: false,
+            writable: false,
+            configurable: false,
+          });
 
           return organization;
         } catch (error: any) {

scripts/transformers/data-transformer.ts

@@ -10,6 +10,7 @@ export class DataTransformer {
   static transformOrganization = (
     organization: Organization,
   ): OrganizationData => ({
+    contactUser: UserTransformer.transformUser(organization),
     name: organization['常用名称'] || organization.name || '',
     code: organization['机构信用代码'] || organization.code || '',
     entityType: DataUtils.transformEntityType(

scripts/transformers/user-transformer.ts

@@ -1,10 +1,7 @@
 import { ExtendedUserData } from '../types';
 
 export class UserTransformer {
-  static transformUser = (
-    organization: any,
-    organizationId?: number,
-  ): ExtendedUserData | null => {
+  static transformUser = (organization: any): ExtendedUserData | null => {
     // 获取用户信息
     const contactName = organization['机构联系人联系人姓名'] || '';
     const contactPhone = organization['机构联系人联系人电话'] || '';
@@ -42,7 +39,6 @@ export class UserTransformer {
       blocked: true, // 阻止登录
       provider: 'local',
       phone: contactPhone || undefined,
-      organizationName: organization['常用名称'] || organization.name,
     } as ExtendedUserData;
   };
 

scripts/types.ts

@@ -26,7 +26,6 @@ export {
 // 扩展的用户数据接口（包含自定义字段）
 export type ExtendedUserData = import('../types').UsersPermissionsUser & {
   phone?: string;
-  organizationName?: string;
 };
 
 // 组织数据接口

scripts/utils/data-importer.ts

@@ -73,8 +73,6 @@ export class DataImporter {
 
       // 创建新组织
       try {
-        let createdOrganization: any = null;
-
         if (this.dryRun) {
           console.log(`[DRY RUN] 将创建组织: ${nameKey}`);
           this.stats.success++;
@@ -86,7 +84,33 @@ export class DataImporter {
         const cleanOrgData = { ...org };
         delete (cleanOrgData as any)._originalData;
 
-        createdOrganization = await this.api.createOrganization(cleanOrgData);
+        // 如果有联系人用户，先创建用户
+        if (cleanOrgData.contactUser) {
+          try {
+            const createdUser = await this.api.createUser(
+              cleanOrgData.contactUser,
+            );
+            console.log(
+              `✓ 成功创建联系人用户: ${cleanOrgData.contactUser.username}`,
+            );
+
+            // 设置组织与用户的关联
+            cleanOrgData.contactUser = (createdUser as any).id || createdUser;
+          } catch (userError: any) {
+            console.error(
+              `✗ 创建用户失败: ${cleanOrgData.contactUser.username}`,
+              userError.message,
+            );
+            this.logger.logFailed(org, userError);
+            this.stats.failed++;
+            continue;
+          }
+        } else {
+          // 如果没有联系人用户，设置为null
+          cleanOrgData.contactUser = null;
+        }
+
+        await this.api.createOrganization(cleanOrgData);
         console.log(`✓ 成功创建组织: ${nameKey}`);
         this.stats.success++;
         smallCache.add(nameKey);