From 666d1c0735cf3855717d1cead7e8bfaf24506bbf Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Sat, 17 Jan 2026 15:42:06 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 0a707a2..9e3ce52 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -977,7 +977,7 @@ class OtherController extends CommonController // 加载关联关系 $areaCourseSigns->load(['user.company', 'course']); - // 将该区域下的学员明细添加到导出数据 + // 将该区域下的学员明细添加到导出数据(一行一个学员) foreach ($areaCourseSigns as $sign) { $areasData[] = [ 'area' => $area, @@ -985,6 +985,7 @@ class OtherController extends CommonController 'company_area' => $sign->user->company->company_area ?? '', 'company_city' => $sign->user->company->company_city ?? '', 'company_province' => $sign->user->company->company_province ?? '', + 'company_address' => $sign->user->company->company_address ?? '', 'user_name' => $sign->user->name ?? '', 'mobile' => $sign->user->mobile ?? '', 'course_name' => $sign->course->name ?? '', @@ -998,6 +999,7 @@ class OtherController extends CommonController 'company_area' => '公司区域', 'company_city' => '公司城市', 'company_province' => '公司省份', + 'company_address' => '公司地址', 'user_name' => '学员姓名', 'mobile' => '手机号', 'course_name' => '课程名称', @@ -1043,7 +1045,7 @@ class OtherController extends CommonController // 加载关联关系 $areaCourseSigns->load(['user.company', 'course']); - // 将该区域下的校友明细添加到导出数据 + // 将该区域下的校友明细添加到导出数据(一行一个学员) foreach ($areaCourseSigns as $sign) { $areasSchoolmateData[] = [ 'area' => $area, @@ -1051,6 +1053,7 @@ class OtherController extends CommonController 'company_area' => $sign->user->company->company_area ?? '', 'company_city' => $sign->user->company->company_city ?? '', 'company_province' => $sign->user->company->company_province ?? '', + 'company_address' => $sign->user->company->company_address ?? '', 'user_name' => $sign->user->name ?? '', 'mobile' => $sign->user->mobile ?? '', 'course_name' => $sign->course->name ?? '',