Merge branch 'master' into ysx-供应商需求-20230520

app/Http/Services/DataService.php

@@ -1174,12 +1174,16 @@ class DataService
         $attachments = SupplierAttachmentsModel::where('field_name', 'cooperation_agreement')->groupBy('supplier_id')->get()->toArray();
         foreach ($attachments as $attachment) {
             $supplier = SupplierChannelModel::where('supplier_id', $attachment['supplier_id'])->first()->toArray();
+            if ($supplier['is_type'] == 1) {
+                continue;
+            }
             $skuUserNameRaw = array_get($users, $supplier['yunxin_channel_uid']);
             $departmentName = (new DepartmentService())->getDepartmentNameByUserName($skuUserNameRaw);
             $excelData[] = [
                 $supplier['supplier_code'],
                 $supplier['supplier_name'],
                 array_get(config('fixed.SupplierGroup'), $supplier['supplier_group'], '未设置'),
+                $skuUserNameRaw,
                 $departmentName
             ];
         }