master
cody 2 weeks ago
parent c05d0aa8c5
commit 4850064620

@ -332,7 +332,7 @@ class CourseSign extends SoftDeletesModel
*/
public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false)
{
$courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids);
$courseSignsQuery = self::getStudentList($start_date, $end_date, null, $course_ids);
$courseSignByType = $courseSignsQuery->get();
// 检测关键词
@ -347,9 +347,9 @@ class CourseSign extends SoftDeletesModel
$query->orWhere('company_name', 'like', '%' . $item . '%');
}
})->get();
$list = User::whereHas('users', function ($query) use ($courseSignByType, $companyNameKeyword) {
$query->whereIn('id', $courseSignByType->pluck('user_id'));
})->whereIn('company_id', $company->pluck('id'))->get();
$list = User::whereIn('id', $courseSignByType->pluck('user_id'))
->whereIn('company_id', $company->pluck('id'))
->get();
if ($retList) {
// 返回列表

Loading…
Cancel
Save