瀏覽代碼

代码提交

weifanli 3 年之前
父節點
當前提交
2a5dd6b169

+ 0 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherTypeEnum.java

@@ -65,8 +65,6 @@ public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
         }
         if (teacherType.length() > 0) {
             teacherType = teacherType.substring(1);
-        } else {
-            teacherType = TeacherTypeEnum.TOURIST.getCode();
         }
         return teacherType;
     }

+ 6 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -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);