master
cody 3 months ago
parent d0a413890e
commit 365cbb66ab

@ -944,7 +944,8 @@ class OtherController extends CommonController
'course_count' => 0, 'course_count' => 0,
]); ]);
} else { } else {
// 每个学员一行,每行都显示完整的公司信息 // 每个学员一行,公司信息只在第一行显示,后续行公司信息为空
$isFirstRow = true;
foreach ($users as $userData) { foreach ($users as $userData) {
$user = $userData['user'] ?? null; $user = $userData['user'] ?? null;
$courses = $userData['courses'] ?? []; $courses = $userData['courses'] ?? [];
@ -962,13 +963,33 @@ class OtherController extends CommonController
// 报名课程数 // 报名课程数
$courseCount = count($courses); $courseCount = count($courses);
// 每个学员一行,每行都显示完整的公司信息 if ($isFirstRow) {
$data[] = array_merge($companyInfo, [ // 第一行:显示公司信息
'user_name' => $userData['user_name'] ?? $user->name ?? '', $data[] = array_merge($companyInfo, [
'course_names' => $courseNames, 'user_name' => $userData['user_name'] ?? $user->name ?? '',
'course_types' => $courseTypes, 'course_names' => $courseNames,
'course_count' => $courseCount, 'course_types' => $courseTypes,
]); 'course_count' => $courseCount,
]);
$isFirstRow = false;
} else {
// 后续行:公司信息为空
$data[] = [
'company_name' => '',
'company_legal_representative' => '',
'company_date' => '',
'stock_date' => '',
'is_after_enrollment' => '',
'company_address' => '',
'company_city' => '',
'company_area' => '',
'company_tag' => '',
'user_name' => $userData['user_name'] ?? $user->name ?? '',
'course_names' => $courseNames,
'course_types' => $courseTypes,
'course_count' => $courseCount,
];
}
} }
} }
} }

Loading…
Cancel
Save