From d7a4bed350f53d89e1332c9e5ac5da5f3aa48cba Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Fri, 28 Nov 2025 17:34:01 +0800
Subject: [PATCH] update

---
 app/Models/CourseSign.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php
index 67cba4e..0337b30 100755
--- a/app/Models/CourseSign.php
+++ b/app/Models/CourseSign.php
@@ -523,11 +523,6 @@ class CourseSign extends SoftDeletesModel
             '常州团队',
             '国企元禾'
         ];
-        //        $company = Company::where(function ($query) use ($companyNameKeyword) {
-//            foreach ($companyNameKeyword as $item) {
-//                $query->orWhere('company_name', 'like', '%' . $item . '%');
-//            }
-//        })->get();
         $list = User::whereIn('id', $courseSignByType->pluck('user_id'))
             ->where(function ($query) use ($companyNameKeyword) {
                 foreach ($companyNameKeyword as $item) {
@@ -555,9 +550,15 @@ class CourseSign extends SoftDeletesModel
     public static function ganbu($start_date = null, $end_date = null, $course_ids = null, $retList = false)
     {
         $courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids);
+        // 获取需要统计跟班学员的课程
+        $genbanCourse = Course::whereHas('typeDetail', function ($query) {
+            $query->where('is_count_genban', 1);
+        })->get();
+
         $courseSigns = $courseSignsQuery->whereHas('user', function ($query) {
             $query->where('from', 'like', '%跟班学员%');
-        })->get();
+        })->whereIn('course_id', $genbanCourse->pluck('id'))->get();
+
         if ($retList) {
             return User::with('company')->whereIn('id', $courseSigns->pluck('user_id'))->get();
         } else {