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