From ce9a4fa42bf6a3f1dfdbb39ee1443e6a278f7471 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 04 十二月 2023 11:32:08 +0800
Subject: [PATCH] 12.4.1
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
index dfe4735..3016932 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
@@ -107,7 +107,11 @@
@Override
public List<ClassListDto> getClassList(Integer tStudentId) {
- return this.baseMapper.getClassList(tStudentId);
+ List<ClassListDto> classList = this.baseMapper.getClassList(tStudentId);
+ List<ClassListDto> holiList = this.baseMapper.getHoliList(tStudentId);
+ classList.addAll(holiList);
+
+ return classList;
}
@Override
--
Gitblit v1.7.1