|
|
|
|
@ -68,7 +68,6 @@ class CourseContentCheckController extends BaseController
|
|
|
|
|
'course.typeDetail',
|
|
|
|
|
'user',
|
|
|
|
|
'courseContentCheck' => function ($query) use ($all) {
|
|
|
|
|
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
|
|
|
|
|
if (isset($all['course_content_id'])) {
|
|
|
|
|
$query->where('course_content_id', $all['course_content_id']);
|
|
|
|
|
}
|
|
|
|
|
@ -123,14 +122,12 @@ class CourseContentCheckController extends BaseController
|
|
|
|
|
if (isset($all['has_check'])) {
|
|
|
|
|
if ($all['has_check'] == 1) {
|
|
|
|
|
$list = $list->whereHas('courseContentCheck', function ($query) use ($all) {
|
|
|
|
|
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
|
|
|
|
|
if (isset($all['course_content_id'])) {
|
|
|
|
|
$query->where('course_content_id', $all['course_content_id']);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
$list = $list->whereDoesntHave('courseContentCheck', function ($query) use ($all) {
|
|
|
|
|
$query->whereColumn('course_content_checks.user_id', 'course_signs.user_id');
|
|
|
|
|
if (isset($all['course_content_id'])) {
|
|
|
|
|
$query->where('course_content_id', $all['course_content_id']);
|
|
|
|
|
}
|
|
|
|
|
@ -171,8 +168,8 @@ class CourseContentCheckController extends BaseController
|
|
|
|
|
* )
|
|
|
|
|
*/
|
|
|
|
|
public
|
|
|
|
|
function show()
|
|
|
|
|
{
|
|
|
|
|
function show(
|
|
|
|
|
) {
|
|
|
|
|
return parent::show();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -191,8 +188,8 @@ class CourseContentCheckController extends BaseController
|
|
|
|
|
* )
|
|
|
|
|
*/
|
|
|
|
|
public
|
|
|
|
|
function save()
|
|
|
|
|
{
|
|
|
|
|
function save(
|
|
|
|
|
) {
|
|
|
|
|
return parent::save();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -211,8 +208,8 @@ class CourseContentCheckController extends BaseController
|
|
|
|
|
* )
|
|
|
|
|
*/
|
|
|
|
|
public
|
|
|
|
|
function destroy()
|
|
|
|
|
{
|
|
|
|
|
function destroy(
|
|
|
|
|
) {
|
|
|
|
|
return parent::destroy();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|