施工单完成一半

app/Service/CustomerService.php

@@ -410,6 +410,14 @@ class CustomerService extends Service
             ->toArray();
 
         foreach ($data['data'] as $key => $value){
+            $address = '';
+            if(! empty($value['address1'])) {
+                $tmp = json_decode($value['address1'],true);
+                $tmp = implode(' ',$tmp);
+                $tmp .= ' ' . $value['address2'];
+                $address = $tmp;
+            }
+            $data['data'][$key]['address'] = $address;
             $data['data'][$key]['customer_intention_title'] = $basic_map[$value['customer_intention']] ?? '';
             $data['data'][$key]['customer_from_title'] = $basic_map[$value['customer_from']] ?? '';
             $data['data'][$key]['customer_type_title'] = $basic_map[$value['customer_type']] ?? '';