修复数据

app/Http/Services/DataService.php

@@ -16,6 +16,7 @@ use App\Model\SpuBrandModel;
 use App\Model\StandardBrandMappingModel;
 use App\Model\StandardBrandMappingModel;
 use App\Model\StandardBrandModel;
 use App\Model\StandardBrandModel;
 use App\Model\SupplierAccountModel;
 use App\Model\SupplierAccountModel;
+use App\Model\SupplierAddressModel;
 use App\Model\SupplierAttachmentsModel;
 use App\Model\SupplierAttachmentsModel;
 use App\Model\SupplierChannelModel;
 use App\Model\SupplierChannelModel;
 use App\Model\SupplierContactModel;
 use App\Model\SupplierContactModel;
@@ -547,7 +548,29 @@ class DataService
                 }, $supplierList);
                 }, $supplierList);
                 $suppliers = array_merge($suppliers, $supplierList);
                 $suppliers = array_merge($suppliers, $supplierList);
             }
             }
+            //再去匹配发货地址
+            $supplierIdAddr = SupplierAddressModel::where('address', 'like', "%{$keyword}%")->pluck('supplier_id')->toArray();
+            if ($supplierIdAddr) {
+                $supplierList = SupplierChannelModel::whereIn('supplier_id', $supplierIdAddr)->select([
+                    'supplier_name',
+                    'phone',
+                    'supplier_address',
+                ])->get()->toArray();
+                if ($supplierList) {
+                    $supplierList = array_map(function ($supplier) use ($keyword) {
+                        $supplier['keyword'] = $keyword;
+                        return $supplier;
+                    }, $supplierList);
+                    $suppliers = array_merge($suppliers, $supplierList);
+                }
+            }
+
         }
         }
+
+        $idColumn = array_column($suppliers, 'supplier_name');
+        $idColumn = array_unique($idColumn);
+        $suppliers = array_intersect_key($suppliers, $idColumn);
+
         Excel::create('实体名单供应商导出', function ($excel) use ($suppliers) {
         Excel::create('实体名单供应商导出', function ($excel) use ($suppliers) {
             $header = [
             $header = [
                 '供应商名字',
                 '供应商名字',