From e46b7eccb0fe47c4e478defc399ade61e342751b Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Thu, 5 Sep 2024 09:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPPTX=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeCourseInfoService.java      | 11 +++++++++++
 ...CollegesJurisdictionExperimentalSystemService.java |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index bf3bde0c..2a7a8f9b 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/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()));
diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java
index c323edb7..99cb0c29 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java
+++ b/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);