Merge remote-tracking branch 'origin/master'

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

@@ -236,12 +236,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
                 sysUser.setImToken(register.getToken());
             } else {
+                if(!sysUser.getUsername().equals(studentRegistration.getName())){
+                    throw new BizException("操作失败：账户已被注册");
+                }
                 if (!sysUser.getUserType().contains("STUDENT")) {
                     sysUser.setUserType(sysUser.getUserType() + ",STUDENT");
                 }
                 sysUser.setPhone(studentRegistration.getParentsPhone());
                 sysUser.setOrganId(studentRegistration.getOrganId());
                 sysUser.setRealName(studentRegistration.getParentsName());
+
                 sysUser.setUsername(studentRegistration.getName());
                 sysUser.setGender(studentRegistration.getGender());
                 sysUser.setBirthdate(studentRegistration.getBirthdate());
@@ -586,6 +590,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setImToken(register.getToken());
                 teacherDao.updateUser(sysUser);
             } else {
+                if(!sysUser.getUsername().equals(studentRegistration.getName())){
+                    throw new BizException("操作失败：账户已被注册");
+                }
                 if (!sysUser.getUserType().contains("STUDENT")) {
                     sysUser.setUserType(sysUser.getUserType() + ",STUDENT");
                 }