diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index c24e732..ec4c60a 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -507,7 +507,8 @@ class OtherController extends CommonController $usersData[$userId]['courseSigns'][] = $sign; } - // 每个学员一行,每行都显示完整的公司信息 + // 每个学员一行,公司信息只在第一行显示,后续行公司信息为空 + $isFirstRow = true; foreach ($usersData as $userData) { $user = $userData['user']; $courseSigns = collect($userData['courseSigns']); @@ -526,13 +527,33 @@ class OtherController extends CommonController // 报名课程数 $courseCount = $courseSigns->count(); - // 每个学员一行,每行都显示完整的公司信息 - $data[] = array_merge($companyInfo, [ - 'user_name' => $user->name ?? '', - 'course_names' => $courseNames, - 'course_types' => $courseTypes, - 'course_count' => $courseCount, - ]); + if ($isFirstRow) { + // 第一行:显示公司信息 + $data[] = array_merge($companyInfo, [ + 'user_name' => $user->name ?? '', + 'course_names' => $courseNames, + 'course_types' => $courseTypes, + 'course_count' => $courseCount, + ]); + $isFirstRow = false; + } else { + // 后续行:公司信息为空 + $data[] = [ + 'company_name' => '', + 'company_legal_representative' => '', + 'company_date' => '', + 'company_address' => '', + 'business_scope' => '', + 'contact_phone' => '', + 'contact_mail' => '', + 'company_tag' => '', + 'credit_code' => '', + 'user_name' => $user->name ?? '', + 'course_names' => $courseNames, + 'course_types' => $courseTypes, + 'course_count' => $courseCount, + ]; + } } } }