From e76833a3c271326c7fcb959291f6edefe9903bab Mon Sep 17 00:00:00 2001
From: "liu.zixi" <liu.zixi@ebiz-digits.com>
Date: Sat, 6 Dec 2025 17:22:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xboe/module/course/dao/CourseDao.java | 46 ++++++++++---------
 .../xboe/module/course/vo/CoursePageVo.java   |  5 ++
 2 files changed, 29 insertions(+), 22 deletions(-)

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 787452ad..44fd59f5 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
@@ -102,6 +102,7 @@ public class CourseDao extends BaseDao<Course> {
 		StringBuilder builder = new StringBuilder("select ");
 		builder.append("c.id,");
 		builder.append("c.name,");
+		builder.append("c.type,");
 		builder.append("c.cover_img AS coverImg,");
 		builder.append("c.sys_type1 AS sysType1,");
 		builder.append("c.sys_type2 AS sysType2,");
@@ -143,59 +144,60 @@ public class CourseDao extends BaseDao<Course> {
 			}
 			
 			vo.setName((String) row[1]);
-			vo.setCoverImg((String) row[2]);
-			vo.setSysType1((String) row[3]);
-			vo.setSysType2((String) row[4]);
-			vo.setSysType3((String) row[5]);
-			vo.setOrgId((String) row[6]);
-			vo.setOrgName((String) row[7]);
-			vo.setOrgFullName((String) row[8]);
-			vo.setSysCreateBy((String) row[9]);
-			vo.setCreateFrom((String) row[10]);
+			vo.setName((String) row[2]);
+			vo.setCoverImg((String) row[3]);
+			vo.setSysType1((String) row[4]);
+			vo.setSysType2((String) row[5]);
+			vo.setSysType3((String) row[6]);
+			vo.setOrgId((String) row[7]);
+			vo.setOrgName((String) row[8]);
+			vo.setOrgFullName((String) row[9]);
+			vo.setSysCreateBy((String) row[10]);
+			vo.setCreateFrom((String) row[11]);
 			
 			// 增加对Timestamp和LocalDateTime的兼容性，防止Timestamp为null的情况
-			Timestamp sysCreateTimestamp = (Timestamp) row[11];
+			Timestamp sysCreateTimestamp = (Timestamp) row[12];
 			if (sysCreateTimestamp != null) {
 				vo.setSysCreateTime(sysCreateTimestamp.toLocalDateTime());
 			}
 			
-			vo.setForUsers((String) row[12]);
-			vo.setStatus((Integer) row[13]);
-			vo.setPublished((Boolean) row[14]);
+			vo.setForUsers((String) row[13]);
+			vo.setStatus((Integer) row[14]);
+			vo.setPublished((Boolean) row[15]);
 			
 			// 增加对Timestamp和LocalDateTime的兼容性，防止Timestamp为null的情况
-			Timestamp publishTimestamp = (Timestamp) row[15];
+			Timestamp publishTimestamp = (Timestamp) row[16];
 			if (publishTimestamp != null) {
 				vo.setPublishTime(publishTimestamp.toLocalDateTime());
 			}
 			
 			// 防止Number为null的情况
-			Number studysNum = (Number) row[16];
+			Number studysNum = (Number) row[17];
 			if (studysNum != null) {
 				vo.setStudys(studysNum.intValue());
 			} else {
 				vo.setStudys(0);
 			}
 			
-			Number scoreNum = (Number) row[17];
+			Number scoreNum = (Number) row[18];
 			if (scoreNum != null) {
 				vo.setScore(scoreNum.floatValue());
 			} else {
 				vo.setScore(0.0f);
 			}
 			
-			Number durationNum = (Number) row[18];
+			Number durationNum = (Number) row[19];
 			if (durationNum != null) {
 				vo.setCourseDuration(durationNum.longValue());
 			} else {
 				vo.setCourseDuration(0L);
 			}
 			
-			vo.setEnabled((Boolean) row[19]);
-			vo.setOpenCourse((Integer) row[20]);
-			vo.setIsTop((Boolean) row[21]);
-			vo.setTeacherName((String) row[22]);
-			vo.setSortWeight((Integer) row[23]);
+			vo.setEnabled((Boolean) row[20]);
+			vo.setOpenCourse((Integer) row[21]);
+			vo.setIsTop((Boolean) row[22]);
+			vo.setTeacherName((String) row[23]);
+			vo.setSortWeight((Integer) row[24]);
 			coursePageVos.add(vo);
 		}
 		return coursePageVos;
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 c12fa418..139e921d 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
@@ -18,6 +18,11 @@ public class CoursePageVo {
      * 课程名称
      */
     private String name;
+
+    /**
+     * 课程类型
+     */
+    private Integer type;
     
     /**
      * 课程封面图片地址