Commit 3336ce89 authored by jiawei's avatar jiawei

BUG修改===》》》修改学习内容展板列表排序问题

parent 056b90a2
...@@ -38,7 +38,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -38,7 +38,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
"OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " + "OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " +
"OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))" "OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))"
+ "</if>" + "</if>"
+ "order by lcb.sortorder desc" + "order by lcb.sortorder DESC, eb.create_time DESC "
+ "</script>" + "</script>"
) )
IPage<ExhibitionBoard> selectBoardPageByLearningContentId(Page<?> page, String learningContentId, String nameOrCode); IPage<ExhibitionBoard> selectBoardPageByLearningContentId(Page<?> page, String learningContentId, String nameOrCode);
......
...@@ -435,11 +435,11 @@ public class LearningContentController extends BaseController { ...@@ -435,11 +435,11 @@ public class LearningContentController extends BaseController {
} }
}); });
}); });
exhibitionBoardList = exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder)).collect(Collectors.toList()); exhibitionBoardList = exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder).reversed()).collect(Collectors.toList());
if (!exhibitionBoardList.isEmpty()) { if (!exhibitionBoardList.isEmpty()) {
learningContent.setExhibitionBoardIdList(exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder)).map(ExhibitionBoard::getId).collect(Collectors.toList())); learningContent.setExhibitionBoardIdList(exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder).reversed()).map(ExhibitionBoard::getId).collect(Collectors.toList()));
learningContent.setExhibitionBoardNameList(exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder)).map(ExhibitionBoard::getName).collect(Collectors.toList())); learningContent.setExhibitionBoardNameList(exhibitionBoardList.stream().sorted(Comparator.comparing(ExhibitionBoard::getSortorder).reversed()).map(ExhibitionBoard::getName).collect(Collectors.toList()));
} }
for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) { for (ExhibitionBoard exhibitionBoard : exhibitionBoardList) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment