|
@@ -217,14 +217,12 @@ public class TeacherVipGroupController extends BaseController {
|
|
if(Objects.isNull(teacher)){
|
|
if(Objects.isNull(teacher)){
|
|
return failed("请指定指导老师!");
|
|
return failed("请指定指导老师!");
|
|
}
|
|
}
|
|
- if(Objects.isNull(vipGroupApplyDto.getVipGroupApplyBaseInfo().getOrganId())){
|
|
|
|
- Integer firstStudentId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getFirstStudentId();
|
|
|
|
- SysUser student = teacherDao.getUser(firstStudentId);
|
|
|
|
- if(Objects.isNull(student)||Objects.isNull(student.getOrganId())){
|
|
|
|
- return failed("学员信息异常");
|
|
|
|
- }
|
|
|
|
- vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(student.getOrganId());
|
|
|
|
|
|
+ Integer firstStudentId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getFirstStudentId();
|
|
|
|
+ SysUser student = teacherDao.getUser(firstStudentId);
|
|
|
|
+ if(Objects.isNull(student)||Objects.isNull(student.getOrganId())){
|
|
|
|
+ return failed("学员信息异常");
|
|
}
|
|
}
|
|
|
|
+ vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(student.getOrganId());
|
|
for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
|
|
for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
|
|
courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), vipGroupApplyDto.getVipGroupApplyBaseInfo().getSingleClassMinutes()));
|
|
courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), vipGroupApplyDto.getVipGroupApplyBaseInfo().getSingleClassMinutes()));
|
|
}
|
|
}
|