bug fixed

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

@@ -50,7 +50,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[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX", "XLS", "XLSX"};
+    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);
 
     @Resource

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

@@ -97,15 +97,16 @@ public class VideoContentCatController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("video:content:cat:list")
     @ApiOperation(value = "获取视频内容分类全部列表(无分页)", notes = "获取视频内容分类全部列表(无分页)")
     @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.SELECT)
-    public Map<String, Object> getVideoContentCatList(@RequestParam(value = "copyrightOwnerId", required = false) String copyrightOwnerId) {
+    public Map<String, Object> getVideoContentCatList(@RequestParam(value = "copyrightOwnerId", required = false) List<String> copyrightOwnerIdList) {
         final LambdaQueryWrapper<VideoContentCat> videoContentCatLambdaQueryWrapper = Wrappers.<VideoContentCat>lambdaQuery().orderByDesc(VideoContentCat::getCreateTime);
-        if (StringUtils.isNotBlank(copyrightOwnerId)) {
-            final LambdaQueryWrapper<CopyrightOwnerVideoContentCat> queryWrapper = Wrappers.<CopyrightOwnerVideoContentCat>lambdaQuery().eq(CopyrightOwnerVideoContentCat::getCopyrightOwnerId, copyrightOwnerId);
-            queryWrapper.select(CopyrightOwnerVideoContentCat::getVideoContentCatId);
-            final List<String> videoContentCatIdList = this.copyrightOwnerVideoContentCatService.listObjs(queryWrapper, Object::toString);
-            videoContentCatLambdaQueryWrapper.in(VideoContentCat::getId, videoContentCatIdList);
+        if (copyrightOwnerIdList != null && !copyrightOwnerIdList.isEmpty()) {
+            final LambdaQueryWrapper<CopyrightOwnerVideoContentCat> queryWrapper = Wrappers.<CopyrightOwnerVideoContentCat>lambdaQuery().in(CopyrightOwnerVideoContentCat::getCopyrightOwnerId, copyrightOwnerIdList);
+            final List<CopyrightOwnerVideoContentCat> copyrightOwnerVideoContentCatList = this.copyrightOwnerVideoContentCatService.list(queryWrapper);
+            if (!copyrightOwnerVideoContentCatList.isEmpty()) {
+                final List<String> collect = copyrightOwnerVideoContentCatList.stream().map(CopyrightOwnerVideoContentCat::getVideoContentCatId).distinct().collect(Collectors.toList());
+                videoContentCatLambdaQueryWrapper.in(VideoContentCat::getId, collect);
+            }
         }
-
         List<VideoContentCat> videoContentCatList = videoContentCatService.list(videoContentCatLambdaQueryWrapper);
         return getResult(videoContentCatList);
     }