#G： 优化判断

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/experiment/TeacherExperimentController.java

@@ -78,7 +78,7 @@ public class TeacherExperimentController extends BaseController {
     schoolLabClassYearVo.setGradeId(gradeId);
     schoolLabClassYearVo.setGradeId(gradeId);
     //获取学科
     //获取学科
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
-    if (null != map.get("courseId")){
+    if (map != null && null != map.get("courseId")){
       String s = map.get("courseId");
       String s = map.get("courseId");
       List<String> list = Arrays.asList(s.split(","));
       List<String> list = Arrays.asList(s.split(","));
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
@@ -193,7 +193,7 @@ public class TeacherExperimentController extends BaseController {
     //设置级部
     //设置级部
     //获取学科
     //获取学科
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
     Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
-    if (null != map.get("courseId")) {
+    if (map != null && null != map.get("courseId") ) {
       String s = map.get("courseId");
       String s = map.get("courseId");
       List<String> list = Arrays.asList(s.split(","));
       List<String> list = Arrays.asList(s.split(","));
       List<String> myList = list.stream().distinct().collect(Collectors.toList());
       List<String> myList = list.stream().distinct().collect(Collectors.toList());