|
|
|
|
@ -247,9 +247,9 @@ class OtherController extends CommonController
|
|
|
|
|
// 条件2:course id 筛选(或关系)
|
|
|
|
|
if ($courses && $courses->count() > 0) {
|
|
|
|
|
if ($hasCondition) {
|
|
|
|
|
$query->orWhereHas('course_id', $courses->pluck('id'));
|
|
|
|
|
$query->orWhereIn('course_id', $courses->pluck('id'));
|
|
|
|
|
} else {
|
|
|
|
|
$query->where('course_id', $courses->pluck('id'));
|
|
|
|
|
$query->whereIn('course_id', $courses->pluck('id'));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})->get();
|
|
|
|
|
|