教师基本信息

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -94,8 +94,12 @@
         <result property="userphone" column="userphone"></result>
         <result property="usertime" column="usertime"></result>
         <result property="createtime" column="createtime"></result>
-        <result property="lsbname" column="lsbname"></result>
         <result property="rolename" column="rolename"></result>
+        <collection property="lsblist" ofType="java.util.Map" javaType="java.util.List">
+            <result property="subjectname" column="subjectname"></result>
+            <result property="versionname" column="versionname"></result>
+            <result property="lsbname" column="lsbname"></result>
+        </collection>
         <collection property="classlist" ofType="java.util.Map"
                     javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype,year=year}">
         </collection>
@@ -118,8 +122,7 @@
     <!--教师基本信息-->
     <select id="getTeacherInfo" resultMap="teacherInfoMap">
         select u.userid,u.username,u.headpic,u.loginname,u.usersex,u.userphone,u.usertime,u.createtime
-        ,group_concat(distinct s.subjectname order by s.subjectorder)subjectname
-        ,group_concat(concat(s.subjectname,'-',v.versionname,'-',sb.lsbname) separator '  ')lsbname
+        ,s.subjectname,v.versionname,sb.lsbname
         ,(select group_concat(r.rolename separator '  ')
         from t_user_role ur left join t_role r on ur.roleid=r.roleid where ur.userid=#{userid})rolename
         ,#{classtype} classtype,#{year} year
@@ -129,6 +132,7 @@
         left join t_subject s on sb.subjectid=s.subjectid
         LEFT JOIN t_version v ON sb.versionid=v.versionid
         where u.userid=#{userid}
+        order by s.subjectorder,v.versionorder,sb.lsborder
     </select>
     <!--更新学生硬件绑定信息-->
     <update id="updateBindMac">