|
|
|
|
@ -239,7 +239,7 @@ class OtherController extends CommonController
|
|
|
|
|
|
|
|
|
|
// 条件1:course_type_id 筛选
|
|
|
|
|
if ($course_type_id) {
|
|
|
|
|
$course_type_id_array = is_array($course_type_id) ? $course_type_id : explode(',', $course_type_id);
|
|
|
|
|
$course_type_id_array = $course_type_id;
|
|
|
|
|
$query->whereIn('course_type_id', $course_type_id_array);
|
|
|
|
|
$hasCondition = true;
|
|
|
|
|
}
|
|
|
|
|
@ -247,13 +247,9 @@ class OtherController extends CommonController
|
|
|
|
|
// 条件2:course id 筛选(或关系)
|
|
|
|
|
if ($courses && $courses->count() > 0) {
|
|
|
|
|
if ($hasCondition) {
|
|
|
|
|
$query->orWhereHas('course', function ($q) use ($courses) {
|
|
|
|
|
$q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
});
|
|
|
|
|
$query->orWhereHas('course_id', $courses->pluck('id'));
|
|
|
|
|
} else {
|
|
|
|
|
$query->whereHas('course', function ($q) use ($courses) {
|
|
|
|
|
$q->whereIn('id', $courses->pluck('id'));
|
|
|
|
|
});
|
|
|
|
|
$query->where('course_id', $courses->pluck('id'));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})->get();
|
|
|
|
|
|