Merge branch 'beetlsql3-dev' of http://118.31.7.2:3000/tianzeOrg/tianze-pro into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -974,6 +974,17 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             }).collect(Collectors.toList());
 
             // 获取课程ids
+            for (int i = 0; i < filteredResourcesInfoList.size(); i++) {
+                TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = filteredResourcesInfoList.get(i);
+                if(teacherOpenCourseMergeResourcesInfo.getResourcesInfoContent()!=null){
+                    String courseInfoContent = teacherOpenCourseMergeResourcesInfo.getResourcesInfoContent();
+                    if(courseInfoContent.contains(".pptx")){
+                        teacherOpenCourseMergeResourcesInfo.setResourcesInfoContent(courseInfoContent.replace("pptx","pdf"));
+                    }else if(courseInfoContent.contains(".word")){
+                        teacherOpenCourseMergeResourcesInfo.setResourcesInfoContent(courseInfoContent.replace("word","pdf"));
+                    }
+                }
+            }
             String courseInfoIds = filteredResourcesInfoList.stream().map(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeCourseInfoId).map(Objects::toString).collect(Collectors.joining(","));
             // 删除临时变量中的资源，提升下次查找的速度
             resourcesInfoCopyOnWriteArrayList.removeIf(it -> courseInfoIds.contains(it.getTeacherOpenCourseMergeCourseInfoId().toString()));

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java

@@ -136,6 +136,9 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C
                 List<ZYUserInfo> userInfos = new ArrayList<>();
                 for(Map<String,Object> student : students){
                     Map<String, Object> map = coreUserService.getSonSystemUserInfoByUserName(String.valueOf(student.get("studentNo")));
+                    if(map==null){
+                        continue;
+                    }
                     map.put("collegeid",universitiesCollegesId);
                     ZYUserInfo info = new ZYUserInfo(map);
                     userInfos.add(info);