From 8c292850c28fc5d69f31da34b9489e087ac42c90 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Tue, 25 Nov 2025 19:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=BA=E8=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusAttendanceServiceImpl.java        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index 025a7f5f..3bf263af 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -409,6 +409,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                 if (!checkInRange(req)) {
                     throw new ServiceException("打卡位置不在范围内", HttpStatus.ERROR);
                 }
+
             }
             //用户信息校验
             SubConstructionUser constructionUser = constructionUserService.getBySysUserId(userId);
@@ -429,15 +430,16 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             // 判断用户是否已经被拉黑
             constructionBlacklistService.validUserInBlacklist(constructionUser.getSysUserId(), req.getProjectId());
             Boolean result = false;
-            // 进行人脸比对
-            try {
-                result = constructionUserService.faceComparison(file, userId);
-            } catch (Exception e) {
-                throw new ServiceException(e.getMessage(), HttpStatus.ERROR);
-            }
-
-            if (!result) {
-                throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.ERROR);
+            // 进行人脸比对 考勤机过来不需进行这一步
+            if (!"1".equals(req.getSource())) {
+                try {
+                    result = constructionUserService.faceComparison(file, userId);
+                } catch (Exception e) {
+                    throw new ServiceException(e.getMessage(), HttpStatus.ERROR);
+                }
+                if (!result) {
+                    throw new ServiceException("人脸识别失败，请重新识别", HttpStatus.ERROR);
+                }
             }
 
             //打卡规则