From 8bf5a8e71dfdb5c15b89a746e594ae3002261e98 Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 13 Nov 2024 15:42:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/SubjectHomeworkService.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php index 315e92c..2e429b8 100644 --- a/app/common/service/SubjectHomeworkService.php +++ b/app/common/service/SubjectHomeworkService.php @@ -121,10 +121,16 @@ class SubjectHomeworkService { try { $data = $request->get(); - $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']]) - ->where(['homework_file_is_publish' => 1]) - ->with(['teacher', 'subject']) - ->findOrEmpty(); + if (!empty((array)$request->teacher)) { + $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']]) + ->with(['teacher', 'subject']) + ->findOrEmpty(); + }else{ + $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id']]) + ->where(['homework_file_is_publish' => 1]) + ->with(['teacher', 'subject']) + ->findOrEmpty(); + } if ($subject_homework->homework_file_url) { $subject_homework->homework_file_url = json_decode($subject_homework->homework_file_url, true); @@ -271,4 +277,4 @@ class SubjectHomeworkService } } -} \ No newline at end of file +}