bug fixed

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

@@ -216,6 +216,7 @@ public class VideoContentController extends BaseController {
             queryWrapper.ge(VideoContent::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
                     .le(VideoContent::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
         }
+        queryWrapper.eq(VideoContent::getDeleted, false);
         // 设置排序规则
         queryWrapper.orderByDesc(VideoContent::getCreateTime);
         // 设置查询内容
@@ -236,12 +237,14 @@ public class VideoContentController extends BaseController {
                 videoContent.setVideoContentCatName(videoContentCat.getName());
             }
             if (videoContent.getVideoContentCopyrightOwnerId() != null) {
-                // todo null
-
                 CopyrightOwner copyrightOwner = this.copyrightOwnerService.getById(videoContent.getVideoContentCopyrightOwnerId());
+                if (copyrightOwner == null) {
+                    videoContent.setVideoContentCopyrightOwnerName("对应的版权方已被删除");
+                } else {
                     videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
                 }
             }
+        }
         return getResult(page);
     }