diff --git a/app/Http/Controllers/Mobile/CourseController.php b/app/Http/Controllers/Mobile/CourseController.php index 8a99c2d..a112a84 100755 --- a/app/Http/Controllers/Mobile/CourseController.php +++ b/app/Http/Controllers/Mobile/CourseController.php @@ -109,10 +109,13 @@ class CourseController extends CommonController if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); } - $detail = Course::with('qunImage', 'typeDetail', 'courseForms', 'teacher','courseContentEvaluation.courseContentEvaluationAsks') - ->withCount(['courseSigns as my_user' => function ($query) { - $query->where('user_id', $this->getUserId()); - }])->find($all['course_id']); + $detail = Course::with(['qunImage', 'typeDetail', 'courseForms', 'teacher', 'courseContentEvaluation' => function ($query) { + $query->with(['courseContentEvaluationAsks' => function ($q) { + $q->orderBy('sort', 'asc'); + }]); + }])->withCount(['courseSigns as my_user' => function ($query) { + $query->where('user_id', $this->getUserId()); + }])->find($all['course_id']); return $this->success($detail); } diff --git a/app/Models/Course.php b/app/Models/Course.php index 1854a0c..a83e1e5 100755 --- a/app/Models/Course.php +++ b/app/Models/Course.php @@ -101,7 +101,7 @@ class Course extends SoftDeletesModel public function courseContentEvaluation() { - return $this->hasOne(CourseContentEvaluation::class, 'course_id', 'id'); + return $this->hasMany(CourseContentEvaluation::class, 'course_id', 'id'); } /**