1

app/Service/ConstructionService.php

@@ -366,13 +366,14 @@ class ConstructionService extends Service
         $construction = $construction->toArray();
         $construction['state_title'] = Construction::$name[$construction['state']] ?? '';
         $construction['pq_state_title'] = Construction::$pq_name[$construction['pq_state']] ?? '';
-        $address = '';
         if(! empty($construction['address1'])) {
             $tmp = json_decode($construction['address1'],true);
             $construction['address1'] = $tmp;
             $tmp = implode(' ',$tmp);
             $tmp .= ' ' . $construction['address2'];
             $address = $tmp;
+        }else{
+            $address = $construction['address2'];
         }
         $construction['address'] = $address;
         $start_time = $construction['start_time'] ? date("Y-m-d H:i",$construction['start_time']) : '';
@@ -682,12 +683,13 @@ class ConstructionService extends Service
         $dispatch = $this->getDispatchData($data['data']);
 
         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;
+            }else{
+                $address = $value['address2'];
             }
             $start_time = $value['start_time'] ? date("Y-m-d H:i",$value['start_time']) : '';
             $end_time = $value['end_time'] ? date("Y-m-d H:i",$value['end_time']) : '';

app/Service/CustomerService.php

@@ -344,13 +344,14 @@ class CustomerService extends Service
             $customer['product_category'] = $product_category ? json_decode($product_category,true) : [];
         }
 
-        $address = '';
         if(! empty($customer['address1'])) {
             $tmp = json_decode($customer['address1'],true);
             $customer['address1'] = $tmp;
             $tmp = implode(' ',$tmp);
             $tmp .= ' ' . $customer['address2'];
             $address = $tmp;
+        }else{
+            $address = $customer['address2'];
         }
         $customer['address'] = $address;
         $customer['customer_contact'] = $customer['employee_one'] = $customer['employee_two'] = $customer['employee_three'] = $customer['img'] = $customer['file'] = $customer['old_employee_one'] = [];
@@ -592,12 +593,13 @@ class CustomerService extends Service
             }
         }
         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;
+            }else{
+                $address = $value['address2'];
             }
             $data['data'][$key]['address'] = $address;
             $data['data'][$key]['customer_intention_title'] = $basic_map[$value['customer_intention']] ?? '';

app/Service/SupplierService.php

@@ -113,13 +113,14 @@ class SupplierService extends Service
             ->first();
         if(empty($customer)) return [false,'供应商不存在或已被删除'];
         $customer = $customer->toArray();
-        $address = '';
         if(! empty($customer['address1'])) {
             $tmp = json_decode($customer['address1'],true);
             $customer['address1'] = $tmp;
             $tmp = implode(' ',$tmp);
             $tmp .= ' ' . $customer['address2'];
             $address = $tmp;
+        }else{
+            $address = $customer['address2'];
         }
         $customer['address'] = $address;
 
@@ -209,12 +210,13 @@ class SupplierService 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;
+            }else{
+                $address = $value['address2'];
             }
             $data['data'][$key]['address'] = $address;
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';