From 4684640dcdc4596eda462d27d2151d9b44d9722d Mon Sep 17 00:00:00 2001 From: xiaomlove Date: Wed, 10 May 2023 02:25:26 +0800 Subject: [PATCH] fix exam filter empty --- app/Repositories/ExamRepository.php | 8 ++++---- include/constants.php | 4 ++-- public/delacctadmin.php | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Repositories/ExamRepository.php b/app/Repositories/ExamRepository.php index 0fc5c270..e7d99285 100644 --- a/app/Repositories/ExamRepository.php +++ b/app/Repositories/ExamRepository.php @@ -251,21 +251,21 @@ class ExamRepository extends BaseRepository $filters = $exam->filters; $filter = Exam::FILTER_USER_CLASS; - $filterValues = $filters[$filter]; + $filterValues = $filters[$filter] ?? []; if (!empty($filterValues) && !in_array($user->class, $filterValues)) { do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filterValues)); return false; } $filter = Exam::FILTER_USER_DONATE; - $filterValues = $filters[$filter]; + $filterValues = $filters[$filter] ?? []; if (!empty($filterValues) && !in_array($user->donate_status, $filterValues)) { do_log("$logPrefix, user donate status: {$user->donate_status} not in: " . json_encode($filterValues)); return false; } $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; - $filterValues = $filters[$filter]; + $filterValues = $filters[$filter] ?? []; $added = $user->added->toDateTimeString(); $registerTimeBegin = isset($filterValues[0]) ? Carbon::parse($filterValues[0])->toDateTimeString() : ''; $registerTimeEnd = isset($filterValues[1]) ? Carbon::parse($filterValues[1])->toDateTimeString() : ''; @@ -868,7 +868,7 @@ class ExamRepository extends BaseRepository } $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; - $range = $filters[$filter]; + $range = $filters[$filter] ?? []; if (!empty($range)) { if (!empty($range[0])) { $baseQuery->where("$userTable.added", ">=", Carbon::parse($range[0])->toDateTimeString()); diff --git a/include/constants.php b/include/constants.php index bd0c70bf..04ac8d4f 100644 --- a/include/constants.php +++ b/include/constants.php @@ -1,6 +1,6 @@