跨机构不允许注册

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

@@ -732,11 +732,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentRegistration == null) {
             throw new BizException("参数校验失败");
         }
-        /*if(studentAddDto.getSignClassId() == null && studentAddDto.getMixClassId() == null){
-            throw new BizException("参数校验失败: 单技班或合奏班必填一项");
-        }*/
         Date date = new Date();
         String musicGroupId = studentRegistration.getMusicGroupId();
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
 
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
@@ -744,6 +742,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
         StudentRegistration phoneAndMusicGroupId = null;
         if(sysUser != null){
+            if(!musicGroup.getTenantId().equals(sysUser.getTenantId())){
+                throw new BizException("该手机号已注册");
+            }
             phoneAndMusicGroupId = studentRegistrationDao.getByUserIdAndMusicGroupId(musicGroupId, sysUser.getId());
         }else {
             phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
@@ -753,7 +754,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             throw new BizException("该学员已存在");
         }
 
-        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         Integer userId;
         if (sysUser == null) {
             //新增user

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -663,6 +663,7 @@
         <result column="im_token_" property="imToken"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <select id="getSysUserByPhone" resultMap="FindSysUser">
         SELECT *