2

app/Service/BasicTypeService.php

@@ -185,6 +185,18 @@ class BasicTypeService extends Service
         return array_column($basic,'id');
     }
 
+    public function basicTypeSearchId($data){
+        $title = "";
+        $basic = BasicType::where('id', $data)
+            ->select('title')
+            ->first();
+        if(! empty($basic)) $title = $basic->title;
+        $basic = BasicType::where('title', $title)
+            ->select('id')
+            ->get()->toArray();
+        return array_column($basic,'id');
+    }
+
     //获取当前
     public function getMyBasicList($user, $type){
         if(! is_array($type)) $type = [$type];

app/Service/ConstructionService.php

@@ -583,8 +583,14 @@ class ConstructionService extends Service
                 ->get()->toArray();
             $model->whereIn('sales_order_id',array_unique(array_column($sale,'id')));
         }
-        if(! empty($data['install_method'])) $model->where('install_method',$data['install_method']);
-        if(! empty($data['install_position'])) $model->where('install_position',$data['install_position']);
+        if(! empty($data['install_method'])) {
+            $id = (new BasicTypeService())->basicTypeSearchId($data['install_method']);
+            $model->whereIn('install_method',$id);
+        }
+        if(! empty($data['install_position'])) {
+            $id = (new BasicTypeService())->basicTypeSearchId($data['install_position']);
+            $model->whereIn('install_position',$id);
+        }
         if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
 
         $list = $this->limit($model,'',$data);