From 6462037dcd079578486a1738206b439f91a1b8bd Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 15 Nov 2025 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(printer):=20=E4=BC=98=E5=8C=96=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E8=AF=86=E5=88=AB=E9=80=BB=E8=BE=91=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E7=85=A7=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在人脸匹配成功后，仅当不存在已匹配的人脸时才自动添加照片到预打印列表
- 更新了用户照片列表的获取条件，确保只在必要时执行此操作
- 保留了对源实体存在的检查，以维持原有业务流程的完整性
---
 .../ycwl/basic/service/printer/impl/PrinterServiceImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
index 1d028117..74037a23 100644
--- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
@@ -871,12 +871,14 @@ public class PrinterServiceImpl implements PrinterService {
         resp.setScenicId(scenicId);
         try {
             faceService.matchFaceId(faceId);
-            autoAddPhotosToPreferPrint(faceId);
+            if (existingFace == null) {
+                autoAddPhotosToPreferPrint(faceId);
+            }
         } catch (Exception e) {
             // 人脸匹配失败不可以阻止正常流程
             log.error("人脸匹配失败", e);
         }
-        if (sourceEntity != null) {
+        if (sourceEntity != null && existingFace == null) {
             List<MemberPrintResp> userPhotoList = getUserPhotoList(userId, scenicId, faceId);
             boolean noneMatch = userPhotoList.stream()
                     .noneMatch(item -> Strings.CI.equals(item.getOrigUrl(), sourceEntity.getUrl()));