From 2db5f6b4c01a965a44ba70c37e38883ffe46513d Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Tue, 20 Jan 2026 15:21:54 +0800 Subject: [PATCH] update --- app/Models/CourseSign.php | 2 +- .../2026_01_17_094313_create_trainee_students_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 582eb70..c114c73 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -806,7 +806,7 @@ class CourseSign extends SoftDeletesModel // 条件2:user.type 包含「人才」的用户 $courseSigns2 = $courseSignsQuery->whereHas('user', function ($q) { - $q->where('type', 'like', '%人才%'); + $q->where('type', 'like', '%人才%')->orWhere('talent_tags', 'like', '%人才%'); })->with(['user.company'])->get(); // 合并两个条件的结果(或关系),并去重 user_id diff --git a/database/migrations/2026_01_17_094313_create_trainee_students_table.php b/database/migrations/2026_01_17_094313_create_trainee_students_table.php index 335ade0..126db18 100644 --- a/database/migrations/2026_01_17_094313_create_trainee_students_table.php +++ b/database/migrations/2026_01_17_094313_create_trainee_students_table.php @@ -19,7 +19,7 @@ return new class extends Migration { $table->string('name')->nullable()->comment('名字'); $table->date('start_date')->nullable()->comment('开始日期'); $table->date('end_date')->nullable()->comment('结束日期'); - $table->integer('total')->default(0)->comment('加减数据(正数表示加,负数表示减)'); + $table->unsignedInteger('total')->default(1)->comment('数量,必须为正数,默认1'); $table->text('remark')->nullable()->comment('备注'); $table->timestamps(); $table->softDeletes();