From 23e33fc5d5d5eb8a085f7882eed5fddf5ad8412d Mon Sep 17 00:00:00 2001 From: Dai Date: Wed, 15 Jan 2025 20:57:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=A6=E7=94=9F=E7=AB=AF=E5=8F=AA?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=91=E5=B8=83=E5=90=8E=E7=9A=84=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/StudentHomeworkService.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/common/service/StudentHomeworkService.php b/app/common/service/StudentHomeworkService.php index ff40adc..eb56236 100644 --- a/app/common/service/StudentHomeworkService.php +++ b/app/common/service/StudentHomeworkService.php @@ -41,7 +41,7 @@ class StudentHomeworkService $data = $request->post(); $student_schedule = StudentSchedule::where(['id' => $data['subject_homework_id']])->findOrEmpty(); - if($student_schedule->isEmpty()){ + if ($student_schedule->isEmpty()) { throw new Exception('未找到学生排课信息'); } @@ -157,7 +157,7 @@ class StudentHomeworkService if ($data['status'] == 0) { //未提交作业的课程 - $model = StudentSchedule::order('id desc')->where('id', 'not in', function ($query) use ($student) { + $model = StudentSchedule::order('id desc')->where(['is_publish' => 1])->where('id', 'not in', function ($query) use ($student) { $query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id'); })->where('student_id', $student->id); $total = $model->count(); @@ -167,7 +167,7 @@ class StudentHomeworkService } else { $model = StudentSchedule::order('id desc') - ->where(['student_id' => $student->id]) + ->where(['student_id' => $student->id, 'is_publish' => 1]) ->where('id', 'in', function ($query) use ($student) { $query->table('wa_student_homework')->where('student_id', $student->id)->field('teacher_schedule_time_id'); }); @@ -226,7 +226,7 @@ class StudentHomeworkService ->with(['student', 'teacher', 'subject']) ->findOrEmpty(); - if($homework->feedback_file_url){ + if ($homework->feedback_file_url) { $homework->feedback_file_url = json_decode($homework->feedback_file_url, true); }