|
@@ -2199,9 +2199,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
throw new BizException("未找到用户分部属性");
|
|
|
}
|
|
|
|
|
|
- if (sysUser.getOrganId().equals(DALIAN_ORGAN_ID)) {
|
|
|
- sysUser.setOrganId(SHENYANG_ORGAN_ID);
|
|
|
- }
|
|
|
+// if (sysUser.getOrganId().equals(DALIAN_ORGAN_ID)) {
|
|
|
+// sysUser.setOrganId(SHENYANG_ORGAN_ID);
|
|
|
+// }
|
|
|
|
|
|
List<Integer> includeTeacherIds = new ArrayList<>();
|
|
|
List<ExtendTeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject2(sysUser.getOrganId(), subjectId);
|
|
@@ -2224,6 +2224,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
List<CourseSchedule> vipCourses = courseTypeCourseMap.get(CourseSchedule.CourseScheduleType.VIP);
|
|
|
if (!CollectionUtils.isEmpty(vipCourses)) {
|
|
|
for (CourseSchedule vipCourse : vipCourses) {
|