Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/PhoneAuthenticationProvider.java

@@ -52,7 +52,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 
 		SysUserInfo userInfo = sysUserService.queryUserInfoByPhone(loginEntity.getPhone(),loginEntity.getClientId());
 		if (userInfo == null && StringUtils.isNotEmpty(loginEntity.getRegisterFlag())) {
-			sysUserService.initUser(loginEntity);
+			userInfo = sysUserService.initUser(loginEntity);
 		}
 		if (userInfo == null) {
 			throw new InternalAuthenticationServiceException("账户不存在");

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/SysUserService.java

@@ -101,7 +101,7 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * 学员注册
 	 * @return
 	 */
-	void initUser(LoginEntity loginEntity);
+	SysUserInfo initUser(LoginEntity loginEntity);
 
 	/**
 	 * 获取用户tenantId

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysUserServiceImpl.java

@@ -143,10 +143,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void initUser(LoginEntity loginEntity) {
+	public SysUserInfo initUser(LoginEntity loginEntity) {
 		if(StringUtils.equalsIgnoreCase(loginEntity.getClientId(),"STUDENT")){
 			eduUserFeignService.studentApply(loginEntity.getOrganId(),loginEntity.getPhone());
-//			return queryUserInfoByPhone(loginEntity.getPhone());
+			return queryUserInfoByPhone(loginEntity.getPhone(),loginEntity.getClientId());
 		}else {
 			throw new UsernameNotFoundException("404.9");
 		}

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -601,7 +601,6 @@
 	</select>
 	<sql id="queryStudentBaseExamsSql">
 		<where>
-			er.level_ = ess.level_
 			<if test="studentId != null">
 				AND er.student_id_ = #{studentId}
 			</if>