更新

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

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\mini;
 
 use App\Models\DeviceName;
+use App\Models\InnerDeviceNamesModel;
 use App\Models\Spec;
 use Illuminate\Http\Request;
 
@@ -39,18 +40,20 @@ class DeviceNameController extends BaseController
     public function getNamesAndSpecs(Request $request)
     {
         if($request->input('type') == 'drop_menu') {
-            $items = $this->model->select('name as text', 'id as value')->get();
+            $items = InnerDeviceNamesModel::select('name as text', 'id as value')->get();
             $items = $items->prepend($this->transObject(['text' => '设备名称', 'value' => '']));
-            foreach ($items as $item) {
-                $specs  = Spec::where('device_name_id', $item->value)->select('name as text', 'id as value')->get();
-                $item->specs = $specs->prepend($this->transObject(['text' => '规格型号', 'value' => '']));
-            }
+//            foreach ($items as $item) {
+//                $specs  = Spec::where('device_name_id', $item->value)->select('name as text', 'id as value')->get();
+//                $item->specs = $specs->prepend($this->transObject(['text' => '规格型号', 'value' => '']));
+//            }
             return $this->success(['data' => $items]);
         }
-        $items = $this->model->select(['id', 'name'])->get();
-        foreach($items as $name) {
-            $name->specs = Spec::where('device_name_id', $name->id)->select(['id', 'name'])->get();
-        }
+        $items = InnerDeviceNamesModel::select(['id', 'name'])->get();
+//        foreach($items as $name) {
+////            $name->specs = Spec::where('device_name_id', $name->id)->select(['id', 'name'])->get();
+////        }
+///
+        dd($items);
         return $this->success(['data' => $items]);
     }
 

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

@@ -33,7 +33,7 @@ class InnerDeviceController extends BaseController
         $project_id = $request->input('project_id');
         if(!empty($project_id)){
             $device_ids = OrderDevice::where('project_id',$project_id)->whereHas('order',function ($query){
-                $query->where('status','=',2)->where('level','=',2)->where('last_project_role_id',5);
+                $query->where('status','=',2)->where('level','=',2)->whereIn('last_project_role_id',[5,7]);
             })->pluck('inner_device_id')->toArray();
             $items = $items->whereIn('id',$device_ids);
         }