From b60758cd2826ea307bedcd85b2cd182e57db3b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 29 Jul 2022 10:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=80=E6=9C=9F=E7=B4=AF?=
 =?UTF-8?q?=E8=AE=A1=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/datacollection/AddUpSituationMapper.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
index 8c962287b..98ae3bf84 100644
--- a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml
@@ -332,7 +332,7 @@
         FROM
         hrsa_add_up_situation t1
         INNER JOIN
-        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation GROUP BY employee_id) t ON
+        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0  GROUP BY employee_id) t ON
         t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month
         LEFT JOIN hrmresource e ON e.id = t1.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid
@@ -352,7 +352,7 @@
         FROM
         hrsa_add_up_situation t1
         INNER JOIN
-        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation GROUP BY employee_id) t ON
+        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation  WHERE delete_type = 0 GROUP BY employee_id) t ON
         t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month
         LEFT JOIN hrmresource e ON e.id = t1.employee_id
         LEFT JOIN hrmdepartment d ON d.id = e.departmentid