|
@@ -82,7 +82,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
|
|
|
@Override
|
|
|
public IPage<TeacherVo> selectPage(IPage<TeacherVo> page, TeacherSearch search) {
|
|
|
- return page.setRecords(baseMapper.selectPage(page, search));
|
|
|
+ List<TeacherVo> teacherVos = baseMapper.selectPage(page, search);
|
|
|
+ return page.setRecords(teacherVos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -299,12 +300,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
|
*/
|
|
|
private Teacher getTeacherDetil(Teacher teacher, TeacherSubmitReq teacherSubmitReq) {
|
|
|
teacher.setSubjectId(teacherSubmitReq.getSubjectId());
|
|
|
-
|
|
|
- String[] teacherTypes = teacherSubmitReq.getTeacherType().split(",");
|
|
|
teacher.setEntryFlag(YesOrNoEnum.NO);
|
|
|
teacher.setEntryAuthDate(null);
|
|
|
teacher.setMusicianFlag(YesOrNoEnum.NO);
|
|
|
teacher.setMusicianDate(null);
|
|
|
+ if(StringUtil.isEmpty(teacherSubmitReq.getTeacherType())){
|
|
|
+ return teacher;
|
|
|
+ }
|
|
|
+ String[] teacherTypes = teacherSubmitReq.getTeacherType().split(",");
|
|
|
for (String teacherType : teacherTypes) {
|
|
|
if (TeacherTypeEnum.ENTRY.getCode().equals(teacherType)) {
|
|
|
teacher.setEntryFlag(YesOrNoEnum.YES);
|