diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 03a0307..f55577d 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -516,14 +516,15 @@ class UserController extends BaseController $schoolmateCourseTypeStats = []; $multiCourseTypeSchoolmateTotal = 0; if (isset($all['is_schoolmate']) && (int) $all['is_schoolmate'] === 1 && empty($all['is_export'])) { - // 当前筛选命中的全部校友;仅统计具体付费课程的报名,按所属体系和校友去重,不受分页影响。 + // 当前筛选命中的全部校友;仅统计开启自动入校友库课程的审核通过报名,按体系和校友去重。 $schoolmates = (clone $list)->reorder()->select('users.id')->toBase(); $registrations = CourseSign::query() ->join('courses', 'courses.id', '=', 'course_signs.course_id') ->join('course_types', 'course_types.id', '=', 'courses.type') ->whereNull('courses.deleted_at') ->whereNull('course_types.deleted_at') - ->where('courses.is_fee', 1) + ->where('courses.auto_schoolmate', 1) + ->where('course_signs.status', 1) ->whereIn('course_signs.user_id', $schoolmates); $schoolmateCourseTypeStats = (clone $registrations) ->select('course_types.id', 'course_types.name')