教师基本信息，学生登陆

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

@@ -13,7 +13,7 @@
     </select>
     <!--学生andorid登录，20211221添加GROUP_CONCAT，因为不绑定的情况下一个mac可以多个帐号登录-->
     <select id="getUserByLoginnameMac" resultType="com.xhkjedu.suser.vo.system.UserVo">
-        select u.userid,u.username,u.loginname,u.loginpwd,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userbirthday,u.cardid,u.headpic,u.usertype,u.usersex,u.userphone,
         u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime
         ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
         ,(case when u.userphone is null or u.userphone='' then 0 else 1 end)hasphone
@@ -95,11 +95,12 @@
         <result property="usertime" column="usertime"></result>
         <result property="createtime" column="createtime"></result>
         <result property="rolename" column="rolename"></result>
-        <collection property="lsblist" ofType="java.util.Map" javaType="java.util.List">
+        <result property="lsbname" column="lsbname"></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>-->
         <collection property="classlist" ofType="java.util.Map"
                     javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype,year=year}">
         </collection>
@@ -122,7 +123,7 @@
     <!--教师基本信息-->
     <select id="getTeacherInfo" resultMap="teacherInfoMap">
         select u.userid,u.username,u.headpic,u.loginname,u.usersex,u.userphone,u.usertime,u.createtime
-        ,s.subjectname,v.versionname,sb.lsbname
+        ,s.subjectname,group_concat(concat(s.subjectname,'-',v.versionname,'-',sb.lsbname) separator '    ')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