Merge branch 'master' of http://gogs.langye.net:3000/tanyuan/wx.sstbc.com

app/Http/Controllers/Admin/CourseContentCheckController.php

@@ -64,6 +64,10 @@ class CourseContentCheckController extends BaseController
     public function index()
     {
         $all = request()->all();
+        $course = Course::find($all['course_id']);
+        if ($course->is_arrange == 0 && isset($all['course_content_id'])) {
+            unset($all['course_content_id']);
+        }
         // 签到用户
         $courseContentCheck = CourseContentCheck::where(function ($query) use ($all) {
             if (isset($all['course_id'])) {
@@ -88,6 +92,7 @@ class CourseContentCheckController extends BaseController
                 $query->where('mobile', 'like', '%' . $all['mobile'] . '%');
             }
         })->where(function ($query) use ($all, $courseContentCheck) {
+            $query->where('status', 1);
             if (isset($all['course_id'])) {
                 $query->where('course_id', $all['course_id']);
             }