Merge remote-tracking branch 'online/master'

app/Http/Controllers/Admin/UserController.php

@@ -436,9 +436,11 @@ class UserController extends BaseController
                 $query->whereBetween('birthday', [$all['start_birthday'], $all['end_birthday']]);
             }
             if (isset($all['keyword'])) {
-                $query->where('school', 'like', '%' . $all['keyword'] . '%')
+                $query->where(function ($q) use ($all) {
-                    ->orWhere('speciality', 'like', '%' . $all['keyword'] . '%')
+                    $q->where('school', 'like', '%' . $all['keyword'] . '%')
-                    ->orWhere('introduce', 'like', '%' . $all['keyword'] . '%');
+                        ->orWhere('speciality', 'like', '%' . $all['keyword'] . '%')
+                        ->orWhere('introduce', 'like', '%' . $all['keyword'] . '%');
+                });
             }
             if (isset($all['talent_tags'])) {
                 $talentTags = explode(',', $all['talent_tags']);