Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TempDirectorTrainingCampDetailServiceImpl.java

@@ -147,10 +147,9 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
             teacher.setDelFlag(YesOrNoEnum.NO);
             teacherDao.insert(teacher);
         }else {
-            //产品说去掉这个校验
-            /*if (sysUser.getUserType().contains("SCHOOL")) {
+            if (sysUser.getUserType().contains("SCHOOL")) {
                 throw new BizException("用户已存在学校账户");
-            }*/
+            }
             Teacher teacher = teacherDao.get(sysUser.getId());
             if(Objects.isNull(teacher)){
                 //注册老师信息
@@ -160,6 +159,7 @@ public class TempDirectorTrainingCampDetailServiceImpl extends ServiceImpl<TempD
                 teacher.setTenantId(1);
                 teacher.setDelFlag(YesOrNoEnum.NO);
                 teacherDao.insert(teacher);
+                sysUser.setRealName(applyCamp.getUsername());
                 sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
                 teacherDao.updateUser(sysUser);
             }