From 4850064620395bd37f66c3c070d1c3474c027a9c Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 26 Nov 2025 16:23:25 +0800 Subject: [PATCH] update --- app/Models/CourseSign.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index a87b741..3938c4b 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -332,7 +332,7 @@ class CourseSign extends SoftDeletesModel */ public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false) { - $courseSignsQuery = self::getStudentList($start_date, $end_date, 1, $course_ids); + $courseSignsQuery = self::getStudentList($start_date, $end_date, null, $course_ids); $courseSignByType = $courseSignsQuery->get(); // 检测关键词 @@ -347,9 +347,9 @@ class CourseSign extends SoftDeletesModel $query->orWhere('company_name', 'like', '%' . $item . '%'); } })->get(); - $list = User::whereHas('users', function ($query) use ($courseSignByType, $companyNameKeyword) { - $query->whereIn('id', $courseSignByType->pluck('user_id')); - })->whereIn('company_id', $company->pluck('id'))->get(); + $list = User::whereIn('id', $courseSignByType->pluck('user_id')) + ->whereIn('company_id', $company->pluck('id')) + ->get(); if ($retList) { // 返回列表