From cc2a0120100ab7b7e5549189907e99cf9a973cb3 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 26 Nov 2025 16:04:04 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/OtherController.php | 2 +- app/Models/CourseSign.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 7483f15..b42c226 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -727,7 +727,7 @@ class OtherController extends CommonController break; case 'company_join_total': - // 元和员工参与企业明细 - 使用模型方法(现在返回的是用户列表) + // 元和员工参与人员明细 - 使用模型方法(现在返回的是用户列表) $users = CourseSign::companyJoin($start_date, $end_date, $course_ids, true); // 加载关联关系 $users->load('company'); diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 9e7a65e..2e00080 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -346,7 +346,7 @@ class CourseSign extends SoftDeletesModel foreach ($companyNameKeyword as $item) { $query->orWhere('company_name', 'like', '%' . $item . '%'); } - })->whereIn('id', $courseSignByType->pluck('user_id'))->get(); + })->whereIn('id1', $courseSignByType->pluck('user_id'))->get(); if ($retList) { // 返回列表 return $list;