| xqd
@@ -470,9 +470,9 @@ class HomeController extends Controller
|
|
|
|
|
|
|
|
|
if ($province == "全部省份") {
|
|
|
- $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('batch_grade', "<=", "$grade - miss_grade")->paginate(10);
|
|
|
+ $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('batch_grade', "<=", '$grade - miss_grade')->paginate(10);
|
|
|
} else {
|
|
|
- $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('batch_grade', "<=", "$grade - miss_grade")->paginate(10);
|
|
|
+ $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('batch_grade', "<=", '$grade - miss_grade')->paginate(10);
|
|
|
}
|
|
|
|
|
|
$count = count($major);
|