diff --git a/app/Http/Controllers/Admin/CourseContentController.php b/app/Http/Controllers/Admin/CourseContentController.php index 261fa2a..6eb67a1 100755 --- a/app/Http/Controllers/Admin/CourseContentController.php +++ b/app/Http/Controllers/Admin/CourseContentController.php @@ -50,7 +50,7 @@ class CourseContentController extends BaseController { $all = request()->all(); $list = $this->model->with($all['show_relation'] ?? []) - ->withCount('courseKeeps', 'courseContentEvaluationForms', 'courseContentEvaluationAsks') + ->withCount('courseKeeps', 'courseContentEvaluationForms', 'courseContentEvaluation.courseContentEvaluationAsks') ->withCount(['courseKeeps as user_sign_total' => function ($query) { $query->where('status', 1); }])->withCount(['courseKeeps as user_lack_sign_total' => function ($query) { @@ -129,7 +129,7 @@ class CourseContentController extends BaseController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = $this->model->with('courseContentEvaluationAsks', 'courseContentEvaluationForms')->find($all['id']); + $detail = $this->model->with('courseContentEvaluation.courseContentEvaluationAsks', 'courseContentEvaluationForms')->find($all['id']); return $this->success($detail); } diff --git a/app/Http/Controllers/Mobile/CourseController.php b/app/Http/Controllers/Mobile/CourseController.php index ad9fb7c..5932224 100755 --- a/app/Http/Controllers/Mobile/CourseController.php +++ b/app/Http/Controllers/Mobile/CourseController.php @@ -280,7 +280,7 @@ class CourseController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = CourseContent::with(['course', 'teacher', 'courseKeeps', 'courseContentEvaluationAsks' => function ($query) { + $detail = CourseContent::with(['course', 'teacher', 'courseKeeps', 'courseContentEvaluation.courseContentEvaluationAsks' => function ($query) { $query->orderBy('sort'); }])->find($all['course_content_id']); return $this->success($detail); diff --git a/app/Models/CourseContent.php b/app/Models/CourseContent.php index ce697f6..0435af5 100755 --- a/app/Models/CourseContent.php +++ b/app/Models/CourseContent.php @@ -46,9 +46,9 @@ class CourseContent extends SoftDeletesModel return $this->hasMany(CourseSign::class, 'course_id', 'course_id'); } - public function courseContentEvaluationAsks() + public function courseContentEvaluation() { - return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_id', 'id'); + return $this->hasOne(CourseContentEvaluation::class, 'course_content_id', 'id'); } public function courseContentEvaluationForms() diff --git a/app/Models/CourseContentEvaluation.php b/app/Models/CourseContentEvaluation.php index a46cdd7..98d65fc 100644 --- a/app/Models/CourseContentEvaluation.php +++ b/app/Models/CourseContentEvaluation.php @@ -4,5 +4,9 @@ namespace App\Models; class CourseContentEvaluation extends SoftDeletesModel { + public function courseContentEvaluationAsks() + { + return $this->hasMany(CourseContentEvaluationAsk::class, 'course_content_evaluation_id', 'id'); + } }