update

app/Http/Controllers/Admin/OtherController.php

@@ -975,12 +975,11 @@ class OtherController extends CommonController
                     }
 
                     // 加载关联关系
-                    $areaCourseSigns->load(['user.company', 'course']);
+                    $areaCourseSigns->load(['user.company', 'course.typeDetail']);
 
                     // 将该区域下的学员明细添加到导出数据（一行一个学员）
                     foreach ($areaCourseSigns as $sign) {
                         $areasData[] = [
-                            'area' => $area,
                             'company_name' => $sign->user->company->company_name ?? '',
                             'company_area' => $sign->user->company->company_area ?? '',
                             'company_city' => $sign->user->company->company_city ?? '',
@@ -988,13 +987,13 @@ class OtherController extends CommonController
                             'company_address' => $sign->user->company->company_address ?? '',
                             'user_name' => $sign->user->name ?? '',
                             'mobile' => $sign->user->mobile ?? '',
+                            'course_type' => $sign->course->typeDetail->name ?? '',
                             'course_name' => $sign->course->name ?? '',
                         ];
                     }
                 }
 
                 $fields = [
-                    'area' => '区域',
                     'company_name' => '企业名称',
                     'company_area' => '公司区域',
                     'company_city' => '公司城市',
@@ -1002,6 +1001,7 @@ class OtherController extends CommonController
                     'company_address' => '公司地址',
                     'user_name' => '学员姓名',
                     'mobile' => '手机号',
+                    'course_type' => '课程体系',
                     'course_name' => '课程名称',
                 ];
 
@@ -1043,12 +1043,11 @@ class OtherController extends CommonController
                     }
 
                     // 加载关联关系
-                    $areaCourseSigns->load(['user.company', 'course']);
+                    $areaCourseSigns->load(['user.company', 'course.typeDetail']);
 
                     // 将该区域下的校友明细添加到导出数据（一行一个学员）
                     foreach ($areaCourseSigns as $sign) {
                         $areasSchoolmateData[] = [
-                            'area' => $area,
                             'company_name' => $sign->user->company->company_name ?? '',
                             'company_area' => $sign->user->company->company_area ?? '',
                             'company_city' => $sign->user->company->company_city ?? '',
@@ -1056,6 +1055,7 @@ class OtherController extends CommonController
                             'company_address' => $sign->user->company->company_address ?? '',
                             'user_name' => $sign->user->name ?? '',
                             'mobile' => $sign->user->mobile ?? '',
+                            'course_type' => $sign->course->typeDetail->name ?? '',
                             'course_name' => $sign->course->name ?? '',
                         ];
                     }