master
cody 2 weeks ago
parent 6bfbece1b1
commit d3529dd642

@ -781,7 +781,7 @@ class OtherController extends CommonController
$data[] = [ $data[] = [
'user_name' => $user->name ?? '', 'user_name' => $user->name ?? '',
'mobile' => $user->mobile ?? '', 'mobile' => $user->mobile ?? '',
'company_name' => $user->company->company_name ?? '', 'company_name' => $user->company->company_name ?? $user->company_name,
'company_position' => $user->company_position ?? '', 'company_position' => $user->company_position ?? '',
'company_city' => $user->company->company_city ?? '', 'company_city' => $user->company->company_city ?? '',
'company_area' => $user->company->company_area ?? '', 'company_area' => $user->company->company_area ?? '',

@ -410,14 +410,17 @@ class CourseSign extends SoftDeletesModel
'常州团队', '常州团队',
'国企元禾' '国企元禾'
]; ];
$company = Company::where(function ($query) use ($companyNameKeyword) { // $company = Company::where(function ($query) use ($companyNameKeyword) {
foreach ($companyNameKeyword as $item) { // foreach ($companyNameKeyword as $item) {
$query->orWhere('company_name', 'like', '%' . $item . '%'); // $query->orWhere('company_name', 'like', '%' . $item . '%');
} // }
})->get(); // })->get();
$list = User::whereIn('id', $courseSignByType->pluck('user_id')) $list = User::whereIn('id', $courseSignByType->pluck('user_id'))
->whereIn('company_id', $company->pluck('id')) ->where(function ($query) use ($companyNameKeyword) {
->get(); foreach ($companyNameKeyword as $item) {
$query->orWhere('company_name', 'like', '%' . $item . '%');
}
})->get();
if ($retList) { if ($retList) {
// 返回列表 // 返回列表

Loading…
Cancel
Save