Merge remote-tracking branch 'origin/master'

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

@@ -59,6 +59,7 @@
         <result column="current_grade_" property="grade"/>
         <result column="current_class_" property="clazz"/>
         <result column="actual_subject_id_" property="subject.id"/>
+        <result column="subject_name_" property="subject.name"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -320,8 +321,8 @@
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
-        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_ FROM sys_user u left join
-        student_registration sr on u.id_ = sr.user_id_ where u.id_ = #{userId} order by sr.create_time_ desc limit 0,1
+        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_,s.name_ subject_name_ FROM sys_user u left join
+        student_registration sr on u.id_ = sr.user_id_ left join subject s on sr.actual_subject_id_ = s.id_ where u.id_ = #{userId} order by sr.create_time_ desc limit 0,1
     </select>
 
     <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">