|
@@ -95,7 +95,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
|
|
record.setTypes(types);
|
|
record.setTypes(types);
|
|
List<Article> list = mapper.selectArticleFrontInfo(record);
|
|
List<Article> list = mapper.selectArticleFrontInfo(record);
|
|
ArticleVO vo = new ArticleVO();
|
|
ArticleVO vo = new ArticleVO();
|
|
- /*List<Article> list1 = new ArrayList<Article>();
|
|
|
|
|
|
+ List<Article> list1 = new ArrayList<Article>();
|
|
List<Article> list2 = new ArrayList<Article>();
|
|
List<Article> list2 = new ArrayList<Article>();
|
|
List<Article> list3 = new ArrayList<Article>();
|
|
List<Article> list3 = new ArrayList<Article>();
|
|
List<Article> list4 = new ArrayList<Article>();
|
|
List<Article> list4 = new ArrayList<Article>();
|
|
@@ -129,7 +129,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
|
|
vo.setList5(list5);
|
|
vo.setList5(list5);
|
|
vo.setList6(list6);
|
|
vo.setList6(list6);
|
|
vo.setList7(list7);
|
|
vo.setList7(list7);
|
|
- vo.setList8(list8);*/
|
|
|
|
|
|
+ vo.setList8(list8);
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -143,10 +143,10 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
|
|
record.setTypes(types);
|
|
record.setTypes(types);
|
|
List<Article> list = mapper.selectArticleFrontInfo(record);
|
|
List<Article> list = mapper.selectArticleFrontInfo(record);
|
|
ArticleVO vo = new ArticleVO();
|
|
ArticleVO vo = new ArticleVO();
|
|
- /*List<Article> list3 = new ArrayList<Article>();
|
|
|
|
- List<Article> list4 = new ArrayList<Article>();
|
|
|
|
- List<Article> list5 = new ArrayList<Article>();
|
|
|
|
- List<Article> list6 = new ArrayList<Article>();
|
|
|
|
|
|
+ List<Article> list3 = new ArrayList<>();
|
|
|
|
+ List<Article> list4 = new ArrayList<>();
|
|
|
|
+ List<Article> list5 = new ArrayList<>();
|
|
|
|
+ List<Article> list6 = new ArrayList<>();
|
|
list.forEach(item->{
|
|
list.forEach(item->{
|
|
if(ArticleTypeEnum.HYYY.getValue().equals(item.getType())){
|
|
if(ArticleTypeEnum.HYYY.getValue().equals(item.getType())){
|
|
list3.add(item);
|
|
list3.add(item);
|
|
@@ -161,7 +161,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleMapper, Article,
|
|
vo.setList3(list3);
|
|
vo.setList3(list3);
|
|
vo.setList4(list4);
|
|
vo.setList4(list4);
|
|
vo.setList5(list5);
|
|
vo.setList5(list5);
|
|
- vo.setList6(list6);*/
|
|
|
|
|
|
+ vo.setList6(list6);
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
}
|
|
}
|