瀏覽代碼

内部设备列表接口报错
维修记录列表接口报错

ChenWuJie 4 年之前
父節點
當前提交
9ca935b600
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 5 1
      app/Http/Controllers/Admin/RepairDeviceController.php
  2. 1 1
      app/Models/InnerDevice.php

+ 5 - 1
app/Http/Controllers/Admin/RepairDeviceController.php

xqd
@@ -71,7 +71,11 @@ class RepairDeviceController extends BaseController
             $item->project_name = $item->project ? $item->project->name : '';
             $item->number = $item->inner_device ? $item->inner_device->number : '';
             $item->spec_name = $item->inner_device ? ($item->inner_device->spec_name ? $item->inner_device->spec_name : '') : '';
-            $item->device_name = $item->inner_device ? ($item->inner_device->device_name ? $item->inner_device->devices_name->name : '') : '';
+            $item->device_name = $item->inner_device ?
+                ($item->inner_device->device_name ?
+                    $item->inner_device->device_name->name ? $item->inner_device->device_name->name : ''
+                    : '')
+                : '';
             $item->work_point_name = $item->work_point ? $item->work_point->name : '';
             $item->status_label = $item->inner_device ? ($item->inner_device->option ? $item->inner_device->option->name :'' ) : '';
         }

+ 1 - 1
app/Models/InnerDevice.php

xqd
@@ -37,7 +37,7 @@ class InnerDevice extends BaseModel
 //
 //    }
 
-    public function devices_name(){
+    public function device_name(){
         return $this->hasOne(InnerDeviceNamesModel::class,'id','device_name_id');
     }
     public function option()