|
|
|
|
@ -173,7 +173,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
{
|
|
|
|
|
$courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids);
|
|
|
|
|
$courseSigns = $courseSignsQuery->whereHas('user', function ($query) {
|
|
|
|
|
$query->where('from', '跟班学员');
|
|
|
|
|
$query->where('from', '%' . '跟班学员' . '%');
|
|
|
|
|
})->get();
|
|
|
|
|
|
|
|
|
|
if ($retList) {
|
|
|
|
|
@ -370,7 +370,7 @@ class CourseSign extends SoftDeletesModel
|
|
|
|
|
{
|
|
|
|
|
$courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids);
|
|
|
|
|
$courseSigns = $courseSignsQuery->whereHas('user', function ($query) {
|
|
|
|
|
$query->where('from', '跟班学员');
|
|
|
|
|
$query->where('from', '%' . '跟班学员' . '%');
|
|
|
|
|
})->get();
|
|
|
|
|
if ($retList) {
|
|
|
|
|
return User::with('company')->whereIn('id', $courseSigns->pluck('user_id'))->get();
|
|
|
|
|
|