伙伴学校班级分组列表去除科目限制

suser/src/main/resources/mapper/gradeclass/GroupMapper.xml

         where g.groupid=#{groupid}
     </update>
     <resultMap id="teacherGroup" type="com.xhkjedu.suser.vo.gradeclass.ClassGroupVo">
-        <result property="classid" column="classid"></result>
-        <result property="classname" column="classname"></result>
-        <result property="gradeid" column="gradeid"></result>
-        <result property="classnum" column="classnum"></result>
+        <result property="classid" column="classid"/>
+        <result property="classname" column="classname"/>
+        <result property="gradeid" column="gradeid"/>
+        <result property="classnum" column="classnum"/>
         <collection property="groups" ofType="com.xhkjedu.suser.vo.gradeclass.GroupVo">
-            <result property="classid" column="classid"></result>
-            <result property="groupid" column="groupid"></result>
-            <result property="groupname" column="groupname"></result>
-            <result property="grouptype" column="grouptype"></result>
-            <result property="groupnum" column="groupnum"></result>
+            <result property="classid" column="classid"/>
+            <result property="groupid" column="groupid"/>
+            <result property="groupname" column="groupname"/>
+            <result property="grouptype" column="grouptype"/>
+            <result property="groupnum" column="groupnum"/>
             <!--<collection property="students" ofType="com.xhkjedu.suser.vo.gradeclass.CStudentVo"
                         javaType="java.util.List" select="listStudent" column="{groupid=groupid}">
             </collection>-->
         </collection>
     </resultMap>
     <resultMap id="studentResult" type="com.xhkjedu.suser.vo.gradeclass.CStudentVo">
-        <result property="studentid" column="studentid"></result>
-        <result property="studentname" column="studentname"></result>
+        <result property="studentid" column="studentid"/>
+        <result property="studentname" column="studentname"/>
     </resultMap>
     <select id="listStudent" resultMap="studentResult">
         select gs.studentid,u.username studentname,u.headpic
     </select>
     <!--伙伴学校班级分组列表-->
     <resultMap id="teacherGroup2" type="java.util.Map">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
         <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
-            <result property="schoolid" column="schoolid"></result>
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
-            <result property="classtype" column="classtype"></result>
+            <result property="schoolid" column="schoolid"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <result property="classtype" column="classtype"/>
             <collection property="groups" ofType="com.xhkjedu.suser.vo.gradeclass.GroupVo" javaType="java.util.List">
-                <result property="classid" column="classid"></result>
-                <result property="groupid" column="groupid"></result>
-                <result property="groupname" column="groupname"></result>
-                <result property="grouptype" column="grouptype"></result>
-                <result property="groupnum" column="groupnum"></result>
+                <result property="classid" column="classid"/>
+                <result property="groupid" column="groupid"/>
+                <result property="groupname" column="groupname"/>
+                <result property="grouptype" column="grouptype"/>
+                <result property="groupnum" column="groupnum"/>
             </collection>
         </collection>
     </resultMap>
         ,c.classid,c.classname,c.classnum,c.gradeid,c.classtype
         ,g.groupid,g.groupname,g.grouptype,g.groupnum
         from t_school_friend sf left join t_school s on sf.fschoolid = s.schoolid
-        left join t_teacher_powersb tp on s.schoolid = tp.schoolid
-        left join t_class_teacher ct on tp.teacherid = ct.teacherid
+        left join t_class_teacher ct on s.schoolid = ct.schoolid
         left join t_class c on ct.classid = c.classid
         left join t_group g on c.classid = g.classid
-        where sf.schoolid=#{schoolid} and tp.subjectid=#{subjectid}
+        where sf.schoolid=#{schoolid}
         and (g.grouptype=1 or g.createid=ct.teacherid)
         and c.gradeid=(select c2.gradeid from t_class c2 left join t_class_teacher ct2 on c2.classid=ct2.classid
         where c2.schoolid=#{schoolid} and c2.year=s.year and c2.classtype in(1,2) and ct2.teacherid=#{teacherid} limit 1)