From 82d86c8c3c8fbce2c2646d984beb49f320826b22 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 30 Oct 2025 11:43:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(face):=E4=BF=AE=E5=A4=8D=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=A0=B7=E6=9C=ACID=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除旧数据合并逻辑，直接使用上传的样本ID列表
- 使用stream过滤和去重处理样本ID
- 简化样本列表变更检测逻辑
- 移除不必要的LinkedHashSet转换
- 优化最终样本列表的生成方式
---
 .../ycwl/basic/service/pc/impl/FaceServiceImpl.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
index 448c489a..63a1159d 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
@@ -1289,16 +1289,13 @@ public class FaceServiceImpl implements FaceService {
         List<Long> currentAccepted = parseMatchSampleIds(face.getMatchSampleIds());
         List<Long> manualAccepted = Optional.ofNullable(req.getManualAcceptedSampleIds()).orElse(Collections.emptyList());
 
-        LinkedHashSet<Long> finalSampleSet = new LinkedHashSet<>();
-        manualAccepted.stream()
+        // 直接使用上传的样本ID列表,不与旧数据合并
+        List<Long> finalSampleList = manualAccepted.stream()
                 .filter(Objects::nonNull)
-                .forEach(finalSampleSet::add);
-        currentAccepted.stream()
-                .filter(Objects::nonNull)
-                .forEach(finalSampleSet::add);
+                .distinct()
+                .collect(Collectors.toList());
 
         boolean hasManualChange = !manualAccepted.isEmpty();
-        List<Long> finalSampleList = new ArrayList<>(finalSampleSet);
         boolean needsUpdate = hasManualChange && !finalSampleList.equals(currentAccepted);
 
         if (needsUpdate) {