From b883a9d1806aed2aa09548bdcb70ae2a9561e454 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 28 Sep 2022 14:53:58 +0800
Subject: [PATCH] update

---
 .../problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java  | 5 +++--
 .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
index 95e57c94a..870abb198 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.oss.entity.OSSFile;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -191,7 +192,7 @@ public class ProblemKnowledgeBaseEO implements Serializable {
     @TableField(exist = false)
     private List<String> problemTypeNameList;
 
-    /**附件展示名称数组*/
+    /**附件展示数组*/
     @TableField(exist = false)
-    private List<String> accessoryFileNameList;
+    private List<OSSFile> accessoryFileNameList;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 00d3bdef1..aa3e94c37 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -720,7 +720,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				String accessoryFile = data.getAccessoryFile();
 				if(StringUtils.isNotEmpty(accessoryFile)){
 					String[] accessoryFileArr = accessoryFile.split(",");
-					List<String> accessoryFiles = accessoryFileList.stream().filter(file -> {
+					List<OSSFile> accessoryFiles = accessoryFileList.stream().filter(file -> {
 						boolean flag = false;
 						for (String accessory : accessoryFileArr) {
 							if (StringUtils.equals(file.getId(), accessory)) {
@@ -729,7 +729,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 							}
 						}
 						return flag;
-					}).map(OSSFile::getFileName).collect(Collectors.toList());
+					}).collect(Collectors.toList());
 					data.setAccessoryFileNameList(accessoryFiles);
 				}
 			});