diff --git a/app/Console/Commands/UpdateCompany.php b/app/Console/Commands/UpdateCompany.php index 90e00b3..fcdc305 100755 --- a/app/Console/Commands/UpdateCompany.php +++ b/app/Console/Commands/UpdateCompany.php @@ -70,6 +70,11 @@ class UpdateCompany extends Command $this->info($user->company_name . '公司不存在'); continue; } + // 如果$result['enterpriseName']存在数字,跳过 + if (preg_match('/\d/', $result['enterpriseName'])) { + $this->info($user->company_name . '公司名称包含数字,跳过'); + continue; + } $where = ['company_name' => $result['enterpriseName']]; $data = [ 'company_address' => $result['address'], diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 665ea18..26409c9 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -216,6 +216,9 @@ class UserController extends BaseController if (isset($all['company_tag'])) { $list = $list->whereHas('company', function ($query) use ($all) { $query->where('company_tag', 'like', '%' . $all['company_tag'] . '%'); + if ($all['company_tag'] == '被投企业') { + $query->orWhere('is_yh_invested', 1); + } }); } $list = $list->whereHas('courseSigns', function ($query) use ($all) {