From c13cc9d0a29d9855ab3f87c10624d9e8695d0481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 12 Dec 2024 18:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=96=AA=E8=B5=84=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java    | 2 +-
 src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
index e368c3d2d..41b6050bb 100644
--- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
+++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
@@ -782,7 +782,7 @@ public class SalaryArchiveExcelBO extends Service {
 //                    .modifier(importHandleParam.getCurrentEmployeeId())
                     .deleteType(NumberUtils.INTEGER_ZERO)
                     .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
-                    .employeeType(importHandleParam.isExtEmp() ? 1 : 0)
+                    .employeeType(importHandleParam.isExtEmp() ? 1 : null)
                     .build();
             // 定薪action 保持状态为待定薪
             if (importHandleParam.isInit() && importHandleParam.getKeepStatus() != null && importHandleParam.getKeepStatus().equals(Boolean.TRUE)) {
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index e9d06ab89..833128372 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -441,7 +441,7 @@
         hrsa_salary_archive t
         LEFT JOIN hrsa_external_employee e ON e.id = t.employee_id
         WHERE t.delete_type = 0
-        and t.employee_type is not null
+        and t.employee_type = 1
         <if test="param.ids != null and param.ids.size()>0">
             AND t.id IN
             <foreach collection="param.ids" open="(" item="id" separator="," close=")">