bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -301,8 +301,12 @@ public class ExhibitionBoardController extends BaseController {
                 exhibitionBoard.setExhibitionBoardCatName(name);
             }
             if (exhibitionBoard.getVideoContentId() != null) {
-                String name = this.videoContentService.getById(exhibitionBoard.getVideoContentId()).getName();
-                exhibitionBoard.setVideoContentName(name);
+                final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
+                if (videoContent == null) {
+                    exhibitionBoard.setVideoContentName("该视频内容已被删除");
+                } else {
+                    exhibitionBoard.setVideoContentName(videoContent.getName());
+                }
             }
         }
         return getResult(page);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java

@@ -343,14 +343,15 @@ public class LearningContentController extends BaseController {
 
                 String videoContentId = exhibitionBoard.getVideoContentId();
                 if (videoContentId != null) {
-                    final VideoContent videoContent = this.videoContentService.getById(videoContentId);
-                    exhibitionBoard.setVideoContentName(videoContent.getName());
-
-                    assetQueryWrapper.clear();
-                    assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
-                    assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
-                    final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
-                    exhibitionBoard.setVideoList(videoList);
+                    final VideoContent videoContent = this.videoContentService.getOne(Wrappers.<VideoContent>lambdaQuery().eq(VideoContent::getId, videoContentId));
+                    if (videoContent != null) {
+                        assetQueryWrapper.clear();
+                        assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
+                        assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
+                        final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
+                        exhibitionBoard.setVideoList(videoList);
+                        exhibitionBoard.setVideoContentName(videoContent.getName());
+                    }
                 }
             }
             learningContent.setExhibitionBoardList(exhibitionBoardList);

src/main/resources/application.properties

@@ -23,6 +23,7 @@ mybatis-plus.configuration.call-setters-on-nulls=true
 mybatis-plus.configuration.jdbc-type-for-null=null
 mybatis-plus.configuration.log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+
 ########################################################
 ###FastDFS
 ########################################################
@@ -51,10 +52,10 @@ spring.mvc.format.date=yyyy-MM-dd HH:mm:ss
 #spring.mvc.static-path-pattern=/public/**
 spring.web.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/statics/,classpath:/public/
 spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-request-size=4096MB
-spring.servlet.multipart.max-file-size=4096MB
+spring.servlet.multipart.max-request-size=102400MB
+spring.servlet.multipart.max-file-size=102400MB
 spring.web.resources.add-mappings=true
-#spring.mvc.converters.preferred-json-mapper=fastjson
+
 
 ########################################################
 ###thymeleaf
@@ -63,6 +64,7 @@ spring.profiles.active=dev
 spring.thymeleaf.mode=HTML
 spring.thymeleaf.cache=false
 
+
 ########################################################
 ###Log
 ########################################################