消息列表报错处理

app/Http/Controllers/Api/mini/ProjectController.php

@@ -103,7 +103,7 @@ class ProjectController extends BaseController
             return $this->success(['data' => $items]);
         }
         $items = $this->model;
-        if($request->input('user_id')) {
+        if($request->input('user_id') && $request->input('type' ) != 'edit' ) {
             $project_ids = ProjectUser::where('user_id', $request->input('user_id'))->pluck('project_id');
             if(count($project_ids) > 0) $items = $items->whereNotIn('id', $project_ids);
         }

app/Http/Controllers/Api/mini/WorkPointController.php

@@ -26,9 +26,13 @@ class WorkPointController extends BaseController
         if($request->input('project_id')) {
             $items = $items->where('project_id', $request->input('project_id'));
         }
+
         if($request->input('type') == 'drop_menu') {
+            $user = Auth::guard('mini')->user();
+
+            $project_ids = ProjectUser::where('user_id', $user->id)->pluck('project_id')->toArray();
 
-            $items = $items->select('name as text', 'id as value')->get();
+            $items = $items->select('name as text', 'id as value')->whereIn('project_id',$project_ids)->get();
             $items = $items->prepend(collect(['text' => '所需工点', 'value' => '']));
             return $this->success(['data' => $items]);
         }

app/Models/Notification.php

@@ -225,8 +225,13 @@ class Notification extends BaseModel
     public function getNameContent()
     {
         $order = Order::find($this['order_id']);
-        $status_name = $order ? $order->getStatusName() : '';
-        $source = ($order->project ? $order->project->name : '') . '-' . ($order->workPoint ? $order->workPoint->name : '') . '-' . ($order->user ? $order->user->name : '');
+
+        //如果没有订单就不展示
+        if(empty($order)){
+            return ['name' => '', 'content' => ''];
+        }
+        $status_name = isset($order) ? $order->getStatusName() : '';
+        $source = ((!empty($order) && !empty($order->project)) ? $order->project->name : '') . '-' . ($order->workPoint ? $order->workPoint->name : '') . '-' . ($order->user ? $order->user->name : '');
 
         $tomorrow = Carbon::tomorrow();
         $days = OrderDevice::where([