From 855a611253c64fe37fe1331614874654afd2faa5 Mon Sep 17 00:00:00 2001
From: ajaxfan <909938737@qq.com>
Date: Wed, 24 Mar 2021 14:34:50 +0800
Subject: [PATCH] =?UTF-8?q?openfeign=E7=9A=84=E6=8B=A6=E6=88=AA=E5=99=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86cookie=E6=B6=88=E6=81=AF=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment/sdk/api/DefaultAttachmentClient.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java
index b61194e..254993b 100644
--- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java
+++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/api/DefaultAttachmentClient.java
@@ -72,9 +72,11 @@ public class DefaultAttachmentClient implements AttachmentClient {
 
 		// 组织数据存储
 		modelConvertor.toQueryResult(json).ifPresent(result -> {
-			result.getData().forEach(data -> {
-				detail.add(new AttachmentEntity().setBid(data.getObjectId()).setId(data.getFileId())
-						.setFilename(data.getOriginalName()).setKey(data.getFileName()));
+			Optional.ofNullable(result.getData()).ifPresent(data -> {
+				data.forEach(item -> {
+					detail.add(new AttachmentEntity().setBid(item.getObjectId()).setId(item.getFileId())
+							.setFilename(item.getOriginalName()).setKey(item.getFileName()));
+				});
 			});
 		});
 		return Optional.of(detail);
@@ -212,7 +214,8 @@ public class DefaultAttachmentClient implements AttachmentClient {
 	public Optional<UploadObject> upload(@NotNull String businessId, @NotNull String filename, @NotNull byte[] array) {
 		removeDuplicateObject(businessId, filename);
 
-		String res = documentCenterService.upload("ebtp-mall-cloud", businessId, fileConvertor.toMultipartFile(filename, array));
+		String res = documentCenterService.upload("ebtp-mall-cloud", businessId,
+				fileConvertor.toMultipartFile(filename, array));
 
 		log.info("document center upload result: {}", res);