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

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

             userids.forEach(uid->{
                 NoticeUserVo nt = new NoticeUserVo();
                 nt.setUserid(uid);
-                RteacherOtherVo rt = teacherMap.get(uid);
-                nt.setGradeid(rt.getGradeid());
-                nt.setSubjectid(rt.getSubjectid());
+                if (teacherMap != null) {
+                    RteacherOtherVo rt = teacherMap.get(uid);
+                    if (rt != null) {
+                        nt.setGradeid(rt.getGradeid());
+                        nt.setSubjectid(rt.getSubjectid());
+                    }
+                }
                 teachers.add(nt);
             });
             notice.setUsers(teachers);

sapi/src/main/resources/mapper/research/ResearchUserMapper.xml

                  left join t_class c on c.schoolid=s.schoolid and c.year=s.year
                  left join t_class_teacher ct on c.classid=ct.classid
                  left join t_teacher_powersb tp on ct.teacherid=tp.teacherid
-        where c.classtype=1 and c.classstate=1 and ct.teacherid in
+        where c.classtype in(1,2) and c.classstate=1 and ct.teacherid in
         <foreach collection="userids" item="u" open="(" close=")" separator=",">
             ${u}
         </foreach>