Explorar o código

Merge pull request #2048 from visuddhinanda/laravel

:bug:未注册用户课程列表报错
visuddhinanda %!s(int64=2) %!d(string=hai) anos
pai
achega
10c0583160
Modificáronse 1 ficheiros con 10 adicións e 11 borrados
  1. 10 11
      app/Http/Resources/CourseResource.php

+ 10 - 11
app/Http/Resources/CourseResource.php

@@ -81,18 +81,17 @@ class CourseResource extends JsonResource
             }
         }
 
-        if($request->get('view') !== "create"){
+        if($request->get('view') === "study" || $request->get('view') === "teach"){
             $user = AuthApi::current($request);
-            if(!$user){
-                return $this->error(__('auth.failed'));
-            }
-            $course_member = CourseMember::where('user_id',$user["user_uid"])
-                                  ->where('course_id',$this->id)
-                                  ->where('is_current',true)
-                                  ->first();
-            if($course_member){
-                $data['my_status'] = $course_member->status;
-                $data['my_status_id'] = $course_member->id;
+            if($user){
+                $course_member = CourseMember::where('user_id',$user["user_uid"])
+                                    ->where('course_id',$this->id)
+                                    ->where('is_current',true)
+                                    ->first();
+                if($course_member){
+                    $data['my_status'] = $course_member->status;
+                    $data['my_status_id'] = $course_member->id;
+                }
             }
         }else{
             //计算待审核