1、修复bug

beetlsql3-dev
wgf 2 years ago
parent b7ff2ab5e3
commit 3e21913c12

@ -96,7 +96,7 @@ public class TeacherOpenCourseScheduleSessionOptions {
private Long userId ; private Long userId ;
/** /**
* 0 1 * 1 2
*/ */
@NotNull(message = "开课课程不能为空", groups =ValidateConfig.ADD.class) @NotNull(message = "开课课程不能为空", groups =ValidateConfig.ADD.class)
private Integer courseType; private Integer courseType;

@ -509,7 +509,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
TeacherOpenCourseScheduleSession tocss = new TeacherOpenCourseScheduleSession(); TeacherOpenCourseScheduleSession tocss = new TeacherOpenCourseScheduleSession();
tocss.setTeacherOpenCourseScheduleSessionAddTime(DateUtil.beginOfHour(DateUtil.date())); tocss.setTeacherOpenCourseScheduleSessionAddTime(DateUtil.beginOfHour(DateUtil.date()));
tocss.setScheduleSessionTitle(options.getScheduleSessionTitle()); tocss.setScheduleSessionTitle(options.getScheduleSessionTitle());
if (ObjectUtil.equal(options.getCourseType(),1)){ if (ObjectUtil.equal(options.getCourseType(),2)){
tocss.setCourseInfoId(options.getTeacherOpenCourseId()); tocss.setCourseInfoId(options.getTeacherOpenCourseId());
}else { }else {
tocss.setTeacherOpenCourseId(options.getTeacherOpenCourseId()); tocss.setTeacherOpenCourseId(options.getTeacherOpenCourseId());

@ -394,20 +394,6 @@ public class TeacherOpenCourseScheduleSessionController{
} }
teacherOpenCourseScheduleSessionService.queryByConditionGroup(page); teacherOpenCourseScheduleSessionService.queryByConditionGroup(page);
teacherOpenCourseScheduleSessionSnapService.fullSessionTagList(page.getList()); teacherOpenCourseScheduleSessionSnapService.fullSessionTagList(page.getList());
if (coreUser.isUniAdmin()){
page.getList().forEach(item ->{
TeacherOpenCourseScheduleSession list = (TeacherOpenCourseScheduleSession) item;
if (ObjectUtil.isEmpty(list.getTeacherOpenCourseId())){
List<TeacherOpenCourse> select = teacherOpenCourseDao.getSQLManager()
.lambdaQuery(TeacherOpenCourse.class)
.andEq(TeacherOpenCourse::getTeacherOpenCourseId, list.getCourseInfoId())
.select();
if (!CollectionUtil.isEmpty(select)){
list.setCourseInfoIdText(select.get(0).getTeacherOpenCourseTitle());
}
}
});
}
return JsonResult.success(page); return JsonResult.success(page);
} }
} }

Loading…
Cancel
Save