bug fixed

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

@@ -94,6 +94,14 @@ public class FileUploadController extends BaseController {
                 failureCount++;
                 continue;
             }
+            if (file.getSize() == 0L) {
+                handleResult.setFileName("");
+                handleResult.setFileUrl("");
+                handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
+                handleResult.setDescription("文件大小为0");
+                failureCount++;
+                continue;
+            }
 
             String extName = FilenameUtils.getExtension(originalFilename);
             boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
@@ -187,7 +195,7 @@ public class FileUploadController extends BaseController {
     @RequiresPermissions("file:image:upload")
     @ApiOperation(value = "单图片上传(封面/缩略图)", notes = "单图片上传(封面/缩略图)")
     public Map<String, Object> uploadImage(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
-        if (uploadFile == null || uploadFile.getSize() == 0) {
+        if (uploadFile == null || uploadFile.getSize() == 0L) {
             throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
         }
         String fileName = uploadFile.getOriginalFilename();
@@ -269,6 +277,14 @@ public class FileUploadController extends BaseController {
                 failureCount++;
                 continue;
             }
+            if (file.getSize() == 0L) {
+                handleResult.setFileName("");
+                handleResult.setFileUrl("");
+                handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
+                handleResult.setDescription("文件大小为0");
+                failureCount++;
+                continue;
+            }
 
             String extName = FilenameUtils.getExtension(originalFilename);
             boolean anyMatch = Arrays.stream(AUDIO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
@@ -371,6 +387,14 @@ public class FileUploadController extends BaseController {
                 failureCount++;
                 continue;
             }
+            if (file.getSize() == 0L) {
+                handleResult.setFileName("");
+                handleResult.setFileUrl("");
+                handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
+                handleResult.setDescription("文件大小为0");
+                failureCount++;
+                continue;
+            }
 
             String extName = FilenameUtils.getExtension(originalFilename);
             boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));
@@ -471,6 +495,14 @@ public class FileUploadController extends BaseController {
                 failureCount++;
                 continue;
             }
+            if (file.getSize() == 0L) {
+                handleResult.setFileName("");
+                handleResult.setFileUrl("");
+                handleResult.setHandleResult(HANDLE_STATUS_ENUM.FAILURE.getName());
+                handleResult.setDescription("文件大小为0");
+                failureCount++;
+                continue;
+            }
 
             String extName = FilenameUtils.getExtension(originalFilename);
             boolean anyMatch = Arrays.stream(VIDEO_TYPE).anyMatch(s -> Objects.equals(s, extName.toUpperCase()));

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

@@ -119,8 +119,8 @@ public class VideoContentCatController extends BaseController {
             lambdaQueryWrapper = lambdaQueryWrapper.select(VideoContent::getId).select(VideoContent::getVideoContentCopyrightOwnerId);
             List<VideoContent> videoContentList = this.videoContentService.list(lambdaQueryWrapper);
             if (!videoContentList.isEmpty()) {
-                final Set<String> assetCopyrightOwnerIdList = videoContentList.stream().map(VideoContent::getVideoContentCopyrightOwnerId).collect(Collectors.toSet());
-                List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(assetCopyrightOwnerIdList);
+                final Set<String> videoContentCopyrightOwnerIdList = videoContentList.stream().map(VideoContent::getVideoContentCopyrightOwnerId).collect(Collectors.toSet());
+                List<CopyrightOwner> copyrightOwnerList = this.copyrightOwnerService.listByIds(videoContentCopyrightOwnerIdList);
                 String copyrightOwnerName = copyrightOwnerList.stream().map(CopyrightOwner::getName).collect(Collectors.joining("、"));
                 videoContentCat.setCopyrightOwnerName(copyrightOwnerName);
             }