#G： 问题修复

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java

@@ -304,7 +304,7 @@ public class TeacherFilesNoticeServiceImpl  extends ServiceImpl<TeacherFilesNoti
             //1。学年是当前
             //1。学年是当前
             if (classDate.getSchoolYear().equals(schoolYear) ){
             if (classDate.getSchoolYear().equals(schoolYear) ){
                 if (collect.isEmpty()){
                 if (collect.isEmpty()){
-                    return null;
+                    return new ArrayList<SchoolClass>();
                 }
                 }
                 //2.学科关联
                 //2.学科关联
                 for (SchoolClassMentor cm :collect){
                 for (SchoolClassMentor cm :collect){

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

@@ -162,28 +162,28 @@ public class ExperimentLevelController extends BaseController {
   @GetMapping("/list")
   @GetMapping("/list")
   public AjaxResult list(SchoolLabClassYearVo schoolLabClassYear)
   public AjaxResult list(SchoolLabClassYearVo schoolLabClassYear)
   {
   {
-    Long userId = userInfoUtil.getMpLoginUser().getUserId();
-    Long gradeId = schoolGradeService.getGradeId(userId);
-    //根据当前角色查看对应的学科
-    //获取学科
-    Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
-    List<String> list = new ArrayList<>();
-    if (null != map.get("courseId")){
-      String s = map.get("courseId");
-      if (map.size() == 1){
-        list.add(s);
-      }else {
-        list =  Arrays.asList(s.split(","));
-      }
-      List<String> myList = list.stream().distinct().collect(Collectors.toList());
-      List<String> strings = schoolLabClassYearService.convertMentor(myList);
-      schoolLabClassYear.setSubs(strings);
-    }else {
-      //没有任课则不显示
-      schoolLabClassYear.setSubs(new ArrayList<String>(){{this.add("999");}});
-    }
-
-    schoolLabClassYear.setGradeId(gradeId);
+//    Long userId = userInfoUtil.getMpLoginUser().getUserId();
+//    Long gradeId = schoolGradeService.getGradeId(userId);
+//    //根据当前角色查看对应的学科
+//    //获取学科
+//    Map<String, String> map = schoolClassMentorService.selectTeacherGroupMentot(userId);
+//    List<String> list = new ArrayList<>();
+//    if (null != map.get("courseId")){
+//      String s = map.get("courseId");
+//      if (map.size() == 1){
+//        list.add(s);
+//      }else {
+//        list =  Arrays.asList(s.split(","));
+//      }
+//      List<String> myList = list.stream().distinct().collect(Collectors.toList());
+//      List<String> strings = schoolLabClassYearService.convertMentor(myList);
+//      schoolLabClassYear.setSubs(strings);
+//    }else {
+//      //没有任课则不显示
+//      schoolLabClassYear.setSubs(new ArrayList<String>(){{this.add("999");}});
+//    }
+//
+//    schoolLabClassYear.setGradeId(gradeId);
     return AjaxResult.success(schoolLabClassYearService.selectSchoolLabClassYearList(schoolLabClassYear));
     return AjaxResult.success(schoolLabClassYearService.selectSchoolLabClassYearList(schoolLabClassYear));
   }
   }