From a579317829e59a01b0086e4372923b865bd8908c Mon Sep 17 00:00:00 2001 From: "liu.zixi" Date: Mon, 24 Nov 2025 16:11:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20page=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=87=BA=E5=8F=82=E5=AD=97=E6=AE=B5isPermission;=20page?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/course/dao/CourseDao.java | 4 +++- .../module/course/service/impl/CoursePageServiceImpl.java | 1 + .../main/java/com/xboe/module/course/vo/CoursePageVo.java | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java index 8bd62321..290b7901 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseDao.java @@ -121,7 +121,8 @@ public class CourseDao extends BaseDao { builder.append("c.enabled,"); builder.append("c.open_course AS openCourse,"); builder.append("c.is_top AS isTop,"); - builder.append("COALESCE(tch.teacher_names, '') AS teacherName"); + builder.append("COALESCE(tch.teacher_names, '') AS teacherName,"); + builder.append("c.sort_weight AS sortWeight"); // 拼接FROM及查询条件语句 appendFrom(builder, queryDTO, isSystemAdmin, orgIds, currentAccountId); // 排序语句 @@ -193,6 +194,7 @@ public class CourseDao extends BaseDao { vo.setOpenCourse((Integer) row[20]); vo.setIsTop((Boolean) row[21]); vo.setTeacherName((String) row[22]); + vo.setSortWeight((Integer) row[23]); coursePageVos.add(vo); } return coursePageVos; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java index f3a8f054..2a3ba058 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java @@ -164,6 +164,7 @@ public class CoursePageServiceImpl implements ICoursePageService { } return courseList.stream() .map(c -> convertToVo(c, courseTeacherList)) + .sorted(Comparator.comparing(CoursePageVo::getSortWeight)) // 按照sortWeight字段进行排序 .collect(Collectors.toList()); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java index 16e30f00..0e3daf23 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java @@ -150,4 +150,11 @@ public class CoursePageVo { * 排序权重 */ private Integer sortWeight; + + /** + * 是否权限课程 + * 默认为true + * TODO 在线课优化二期会对此字段进行其他的赋值操作 + */ + private Boolean isPermission = true; }