From 85d0fc09961dfde52fb2be2993f9b8af774fb46a Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 26 Jan 2026 10:47:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(video):=20=E8=A7=A3=E5=86=B3=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加了 contentPageVO 为 null 的检查并返回 null 避免后续操作
- 添加了 videoRespVO 为 null 的检查并返回 null 避免后续操作
- 在流处理后添加了非空过滤确保结果列表不包含 null 值
---
 .../controller/extern/LyCompatibleController.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
index efc80251..296b2f8d 100644
--- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
+++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
@@ -206,8 +206,14 @@ public class LyCompatibleController {
                 .values().stream()
                 .map(contentPageVOs -> {
                     ContentPageVO contentPageVO = contentPageVOs.stream().filter(vo -> vo.getContentId() != null).findFirst().orElse(null);
-                    Map<String, Object> map = new HashMap<>();
+                    if (contentPageVO == null) {
+                        return null;
+                    }
                     VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId());
+                    if (videoRespVO == null) {
+                        return null;
+                    }
+                    Map<String, Object> map = new HashMap<>();
                     map.put("id", videoRespVO.getId().toString());
                     map.put("task_id", videoRespVO.getTaskId().toString());
                     if (videoRespVO.getFaceId() != null) {
@@ -221,7 +227,7 @@ public class LyCompatibleController {
                     map.put("title", contentPageVO.getName());
                     map.put("ossurldm", videoRespVO.getVideoUrl());
                     return map;
-                }).collect(Collectors.toList());
+                }).filter(java.util.Objects::nonNull).collect(Collectors.toList());
         GoodsReqQuery goodsReqQuery = new GoodsReqQuery();
         goodsReqQuery.setFaceId(faceVO.getId());
         goodsReqQuery.setSourceType(1);