bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -42,7 +42,7 @@ import static cn.wisenergy.chnmuseum.party.common.enums.CopyrightOwnerTypeEnum.V
 @Service
 @Aspect
 @Transactional
-class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
+public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
 
     @Resource
     private SysLogMapper sysLogMapper;
@@ -120,6 +120,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
             return object;
         }
         SysLog sysLog = new SysLog();
+        // todo null
         if (user.getRoleList().contains("1")) {
             sysLog.setType(1);
         } else {

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

@@ -49,7 +49,7 @@ public class FileUploadController extends BaseController {
 
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
     private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
-    private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV", "MPEG"};
+    private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV", "MPEG", "MOV"};
     private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX"};
     private static final String[] DATUM_TYPE = ArrayUtil.addAll(DOC_TYPE, IMAGE_TYPE, VIDEO_TYPE);
 

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

@@ -236,6 +236,8 @@ public class VideoContentController extends BaseController {
                 videoContent.setVideoContentCatName(videoContentCat.getName());
             }
             if (videoContent.getVideoContentCopyrightOwnerId() != null) {
+                // todo null
+
                 CopyrightOwner copyrightOwner = this.copyrightOwnerService.getById(videoContent.getVideoContentCopyrightOwnerId());
                 videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
             }