Merge branch 'fix/0621-fix' into test

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

@@ -567,6 +567,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null == teacher) {
             teacher = new Teacher();
             teacher.setUserId(teacherSubmitReq.getUserId());
+            teacher.setEntryFlag(YesOrNoEnum.NO);
+            teacher.setMusicianFlag(YesOrNoEnum.NO);
             getTeacherDetil(teacher, teacherSubmitReq);
             baseMapper.insert(teacher);
 
@@ -692,10 +694,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
         teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
         if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
-            teacher.setEntryFlag(YesOrNoEnum.NO);
-            teacher.setMusicianFlag(YesOrNoEnum.NO);
-            teacher.setEntryAuthDate(null);
-            teacher.setMusicianDate(null);
             return teacher;
         }
         String[] teacherTypes = teacherSubmitReq.getTeacherType().split(",");