处理薪资档案问题

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)) {

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=")">