gq 7 år sedan
förälder
incheckning
317eec2a3e

+ 1 - 0
server/app/Http/Controllers/Api/V1/Controller.php

xqd
@@ -22,6 +22,7 @@ class Controller extends BaseController
     {
 //        $this->user = UserInfoModel::where('phone','13880642880')->first();
         $this->user = Auth::guard('api')->user();
+//        $this->user = UserInfoModel::find(1);
         return $this->user;
     }
 

+ 7 - 1
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -275,7 +275,13 @@ class DreamController extends Controller
                 $query->orderBy('created_at');
             }])->find($interaction_id);
             if (count($data) > 0) {
-                $interactions[0] = $data;
+                $interactions = $interactions->toArray();
+                foreach ($interactions as $key => $value) {
+                    if ($value['id']==$interaction_id) {
+                        unset($interactions[$key]);
+                    }
+                }
+                array_unshift($interactions,$data);
             }
         }
         $dream->interactions = $interactions;