增加课程排序

@@ -123,4 +123,9 @@ public class Course extends BaseEntity {
      */
      */
     private Integer canPack;
     private Integer canPack;
 
 
+    /**
+     * 排序
+     */
+    private Long sort;
+
 }
 }
\ No newline at end of file

@@ -11,6 +11,7 @@ import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.StreamUtils;
 import com.lego.common.utils.StreamUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.annotation.LanguageAnnotation;
+import com.lego.core.domin.Advert;
 import com.lego.core.domin.Course;
 import com.lego.core.domin.Course;
 import com.lego.core.domin.bo.CourseBo;
 import com.lego.core.domin.bo.CourseBo;
 import com.lego.core.domin.bo.CourseQueryBo;
 import com.lego.core.domin.bo.CourseQueryBo;
@@ -54,7 +55,7 @@ public class CourseServiceImpl implements ICourseService {
     public TableDataInfo<CourseVo> listPage(CourseQueryBo query, String language) {
     public TableDataInfo<CourseVo> listPage(CourseQueryBo query, String language) {
         Page<CourseVo> page = baseMapper.selectVoPage(query.build(),
         Page<CourseVo> page = baseMapper.selectVoPage(query.build(),
                 Wrappers.<Course>lambdaQuery().like(StrUtil.isNotBlank(query.getSearchKey()), Course::getName, query.getSearchKey())
                 Wrappers.<Course>lambdaQuery().like(StrUtil.isNotBlank(query.getSearchKey()), Course::getName, query.getSearchKey())
-                        .eq(Course::getLanguage, language));
+                        .eq(Course::getLanguage, language).orderByAsc(Course::getSort));
         List<CourseVo> list = page.getRecords();
         List<CourseVo> list = page.getRecords();
         if (ObjectUtil.isNotEmpty(list)) {
         if (ObjectUtil.isNotEmpty(list)) {
             Set<String> ids = StreamUtils.toSet(list, CourseVo::getBuildingBlockId);
             Set<String> ids = StreamUtils.toSet(list, CourseVo::getBuildingBlockId);
@@ -94,7 +95,7 @@ public class CourseServiceImpl implements ICourseService {
      */
      */
     @Override
     @Override
     public List<CourseVo> list(String buildingBlockId) {
     public List<CourseVo> list(String buildingBlockId) {
-        List<CourseVo> list =  baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId));
+        List<CourseVo> list =  baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId).orderByAsc(Course::getSort));
         for (CourseVo vo : list) {
         for (CourseVo vo : list) {
             if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
             if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
                 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));
                 SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));