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

app/Http/Controllers/Admin/CourseContentCheckController.php

@@ -73,6 +73,12 @@ class CourseContentCheckController extends BaseController
                 $query->where('course_content_id', $all['course_content_id']);
             }
         })->get();
+        $total = CourseSign::where(function ($query) use ($all) {
+            $query->where('status', 1);
+            if (isset($all['course_id'])) {
+                $query->where('course_id', $all['course_id']);
+            }
+        })->count();
 
         $list = CourseSign::with(['course.typeDetail', 'user'])->whereHas('user', function ($query) use ($all) {
             if (isset($all['name'])) {
@@ -165,7 +171,7 @@ class CourseContentCheckController extends BaseController
                     })->first();
             }
         }
-        return $this->success($list);
+        return $this->success(['list' => $list, 'course_content_check_count' => $courseContentCheck->count(), 'total' => $total]);
     }
 
     /**