cqpCow 1 年之前
父节点
当前提交
e92362b903
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      app/Service/ConstructionService.php

+ 2 - 1
app/Service/ConstructionService.php

@@ -487,7 +487,7 @@ class ConstructionService extends Service
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
-        $array = array_unique(array_merge_recursive(array_column($data['data'],'install_method'),array_column($data['data'],'urgency')));
+        $array = array_unique(array_merge_recursive(array_column($data['data'],'install_method'),array_column($data['data'],'urgency'),array_column($data['data'],'install_position')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -510,6 +510,7 @@ class ConstructionService extends Service
                 $address = $tmp;
             }
             $data['data'][$key]['address'] = $address;
+            $data['data'][$key]['install_position_title'] = $basic_map[$value['install_position']] ?? '';
             $data['data'][$key]['install_method_title'] = $basic_map[$value['install_method']] ?? '';
             $data['data'][$key]['urgency_title'] = $basic_map[$value['urgency']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';