From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
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