From 1881165162698fc462d447c2d213e0b57f2ba5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Mon, 9 Feb 2026 11:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=A8=A1=E5=9D=97=E5=85=A5?=
 =?UTF-8?q?=E5=9C=BA=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/person/FaceContrastNewMapper.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml
index ce52bd4..904a0be 100644
--- a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml
@@ -40,7 +40,7 @@
             AND bs.id = #{params.subId}
         </if>
         LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
-        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1
+        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1'
         LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
         <if test="params.workerType != null and params.workerType !='' ">
             AND bw.worker_type = #{params.workerType}
@@ -257,7 +257,7 @@
             AND bs.id = #{params.subId}
         </if>
         LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
-        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1
+        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1'
         LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
         <if test="params.workerType != null and params.workerType !='' ">
             AND bw.worker_type = #{params.workerType}
@@ -319,7 +319,7 @@
             AND bs.id = #{params.subId}
         </if>
         LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
-        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1
+        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1'
         LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
         <if test="params.workerType != null and params.workerType !='' ">
             AND bw.worker_type = #{params.workerType}
@@ -632,7 +632,7 @@
         </if>
         AND bsc.is_active = '1'
         LEFT JOIN bm_sub_team bst on bsc.sub_id = bst.sub_id and bst.is_active = '1'
-        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1
+        Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1'
         LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
         <if test="params.workerType != null and params.workerType !='' ">
             AND bw.worker_type = #{params.workerType}