From 365cbb66abce24909e561ecd2cbec3c4bf1e3620 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 15 Jan 2026 23:18:50 +0800 Subject: [PATCH] update --- .../Controllers/Admin/OtherController.php | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 1979528..c24e732 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -944,7 +944,8 @@ class OtherController extends CommonController 'course_count' => 0, ]); } else { - // 每个学员一行,每行都显示完整的公司信息 + // 每个学员一行,公司信息只在第一行显示,后续行公司信息为空 + $isFirstRow = true; foreach ($users as $userData) { $user = $userData['user'] ?? null; $courses = $userData['courses'] ?? []; @@ -962,13 +963,33 @@ class OtherController extends CommonController // 报名课程数 $courseCount = count($courses); - // 每个学员一行,每行都显示完整的公司信息 - $data[] = array_merge($companyInfo, [ - 'user_name' => $userData['user_name'] ?? $user->name ?? '', - 'course_names' => $courseNames, - 'course_types' => $courseTypes, - 'course_count' => $courseCount, - ]); + if ($isFirstRow) { + // 第一行:显示公司信息 + $data[] = array_merge($companyInfo, [ + 'user_name' => $userData['user_name'] ?? $user->name ?? '', + 'course_names' => $courseNames, + '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, + ]; + } } } }