Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -414,7 +414,7 @@
 	<!-- 获取报名信息 -->
 	<select id="getExamRegistration" resultMap="ExamRegistrationDtoMap">
 		SELECT er.*,s.name_ subjectName,su.real_name_ studentName,eb.expect_exam_start_time_,eb.expect_exam_end_time_ FROM exam_registration er
-		LEFT JOIN sys_user su ON su.id_ = er.subject_id_
+		LEFT JOIN sys_user su ON su.id_ = er.student_id_
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{examRegistrationId}

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

@@ -28,8 +28,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.api.entity.Student" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,tenant_id_,organ_id_)
-		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{tenantId},#{organId})
+		INSERT INTO student (user_id_,certificate_photo_,create_time_,update_time_,organ_id_)
+		VALUES(#{userId},#{certificatePhoto},NOW(),NOW(),#{organId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -39,9 +39,6 @@
 			<if test="certificatePhoto != null">
 				certificate_photo_ = #{certificatePhoto},
 			</if>
-			<if test="tenantId != null and tenantId != 0">
-				tenant_id_ = #{tenantId},
-			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>