diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php index 71ffd60..71f8440 100644 --- a/app/common/service/SubjectHomeworkService.php +++ b/app/common/service/SubjectHomeworkService.php @@ -181,10 +181,31 @@ class SubjectHomeworkService try { $data = $request->get(); - $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id'], 'homework_file_is_publish' => 1]) + $subject_homework = SubjectHomework::where(['teacher_schedule_time_id' => $data['teacher_schedule_time_id'], 'is_publish' => 1]) ->with(['teacher', 'subject']) ->findOrEmpty(); + if(!$subject_homework->homework_file_is_publish){ + $subject_homework->homework_file_url = ''; + } + if(!$subject_homework->homework_version_is_publish){ + $subject_homework->homework_version_file_url = ''; + } + if(!$subject_homework->last_homework_feedback_is_publish){ + $subject_homework->last_homework_feedback_url = ''; + } + if(!$subject_homework->subject_report_version_is_publish){ + $subject_homework->subject_report_version_url = ''; + } + + if(!$subject_homework->subject_report_version_is_publish){ + $subject_homework->subject_report_version_url = ''; + } + + if(!$subject_homework->subject_file_version_is_publish){ + $subject_homework->subject_file_version_url = ''; + } + if ($subject_homework->homework_file_url) { $subject_homework->homework_file_url = json_decode($subject_homework->homework_file_url, true);