diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index bdcdd5e..ac92edf 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -328,7 +328,7 @@ class CourseSign extends SoftDeletesModel } /** - * 元和员工参与人员 + * 元和员工参人员 */ public static function companyJoin($start_date = null, $end_date = null, $course_ids = null, $retList = false) { @@ -342,13 +342,15 @@ class CourseSign extends SoftDeletesModel '禾裕集团', '苏州科服', '信诚管理咨询', '集成电路公司', '常州团队', '国企元禾' ]; - $list = User::whereHas('company', function ($query) use ($companyNameKeyword) { - $query->where(function ($q) use ($companyNameKeyword) { - foreach ($companyNameKeyword as $item) { - $q->orWhere('company_name', 'like', '%' . $item . '%'); - } - }); - })->whereIn('id1', $courseSignByType->pluck('user_id'))->get(); + $company = Company::whereHas('users', function ($query) use ($courseSignByType, $companyNameKeyword) { + $query->whereIn('id', $courseSignByType->pluck('user_id')); + })->where(function ($query) use ($companyNameKeyword) { + foreach ($companyNameKeyword as $item) { + $query->orWhere('company_name', 'like', '%' . $item . '%'); + } + })->get(); + $list = $company->pluck('users')->flatten(); + if ($retList) { // 返回列表 return $list;