Merge remote-tracking branch 'origin/wn' into ywx

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

@@ -73,7 +73,7 @@
         left join t_subject s on sb.subjectid=s.subjectid
         left join t_class_teacher ct on c.classid=ct.classid and ts.teacherid=ct.teacherid
         left join t_user u on ct.teacherid=u.userid
-        where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1 and u.usertype=1 and u.userstate=1
+        where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1 and u.usertype=1 and u.userstate=1 and c.classtype in (1,2)
         order by c.gradeid,c.classtype,c.classorder,s.subjectorder,convert(u.username using gbk)
     </select>