|
@@ -688,10 +688,12 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
|
|
|
if (fileInfos != null) {
|
|
if (fileInfos != null) {
|
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
|
if (fileInfoList.size()>0) {
|
|
if (fileInfoList.size()>0) {
|
|
|
|
|
+ List<String> fileUrl = new ArrayList<>();
|
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
|
if (fileInfo.getFileType()==1){
|
|
if (fileInfo.getFileType()==1){
|
|
|
- data.setImage(fileInfo.getUrl());
|
|
|
|
|
|
|
+ fileUrl.add(fileInfo.getUrl());
|
|
|
|
|
+ data.setImage(fileUrl);
|
|
|
} else {
|
|
} else {
|
|
|
data.setVideo(fileInfo.getUrl());
|
|
data.setVideo(fileInfo.getUrl());
|
|
|
}
|
|
}
|
|
@@ -1246,10 +1248,12 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
|
|
|
if (fileInfos != null) {
|
|
if (fileInfos != null) {
|
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
|
if (fileInfoList.size() > 0) {
|
|
if (fileInfoList.size() > 0) {
|
|
|
|
|
+ List<String> fileUrl = new ArrayList<>();
|
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
|
if (fileInfo.getFileType()==1){
|
|
if (fileInfo.getFileType()==1){
|
|
|
- data.setImage(fileInfo.getUrl());
|
|
|
|
|
|
|
+ fileUrl.add(fileInfo.getUrl());
|
|
|
|
|
+ data.setImage(fileUrl);
|
|
|
} else {
|
|
} else {
|
|
|
data.setVideo(fileInfo.getUrl());
|
|
data.setVideo(fileInfo.getUrl());
|
|
|
}
|
|
}
|
|
@@ -1318,10 +1322,12 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
|
|
|
for (ArticleListVo data : result.getPageList()) {
|
|
for (ArticleListVo data : result.getPageList()) {
|
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
List<FileInfo> fileInfoList = fileInfos.stream().filter(e -> e.getLinkId().equals(data.getId().toString())).collect(Collectors.toList());
|
|
|
if (fileInfoList.size() > 0) {
|
|
if (fileInfoList.size() > 0) {
|
|
|
|
|
+ List<String> fileUrl = new ArrayList<>();
|
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
for (int i = 0; i < fileInfoList.size(); i++) {
|
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
FileInfo fileInfo = fileInfoList.get(i);
|
|
|
if (fileInfo.getFileType()==1){
|
|
if (fileInfo.getFileType()==1){
|
|
|
- data.setImage(fileInfo.getUrl());
|
|
|
|
|
|
|
+ fileUrl.add(fileInfo.getUrl());
|
|
|
|
|
+ data.setImage(fileUrl);
|
|
|
} else {
|
|
} else {
|
|
|
data.setVideo(fileInfo.getUrl());
|
|
data.setVideo(fileInfo.getUrl());
|
|
|
}
|
|
}
|