1.机构邀请平台老师注册

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

@@ -489,7 +489,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             String userType = sysUser.getUserType();
             List<String> userTypes = Arrays.stream(userType.split(",")).collect(Collectors.toList());
             if (userTypes.contains(ClientEnum.TEACHER.getCode())) {
-                throw new BizException("该手机号已经注册老师账号");
+                Teacher teacher = this.getById(sysUser.getId());
+                // 机构邀请平台老师注册
+                if(Optional.ofNullable(teacher.getTenantId()).orElse(-1L) == -1 && Optional.ofNullable(teacherSubmitReq.getTenantId()).orElse(-1L)>-1){
+                    teacherSubmitReq.setSettlementFrom(ESettlementFrom.TENANT);
+                }else {
+                    throw new BizException("该手机号已经注册老师账号");
+                }
             }
             teacherSubmitReq.setUserId(sysUser.getId());
             updateSysUser(teacherSubmitReq);