From b78e96c875ec6bbb8be14a628d217ae7a560f3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 13 Jun 2022 15:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=88=97=E8=A1=A8=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dsqlserver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/datacollection/AttendQuoteMapper.xml | 2 --
 src/com/engine/salary/web/SalaryArchiveController.java        | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteMapper.xml
index 6138d6348..45874a3db 100644
--- a/src/com/engine/salary/mapper/datacollection/AttendQuoteMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteMapper.xml
@@ -288,8 +288,6 @@
         LEFT JOIN hrmresource e ON e.id = t1.creator
         WHERE
         t1.delete_type = 0 AND t2.delete_type = 0
-        AND e.status not in (7)
-        and (e.accounttype is null or e.accounttype = 0)
         <include refid="paramSql"/>
         ORDER BY t1.id DESC
     </select>
diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java
index 1efd6addf..8af3dab75 100644
--- a/src/com/engine/salary/web/SalaryArchiveController.java
+++ b/src/com/engine/salary/web/SalaryArchiveController.java
@@ -241,6 +241,10 @@ public class SalaryArchiveController {
         if (StringUtils.isNotBlank(importType)) {
             param.setImportType(importType);
         }
+        String hasData = request.getParameter("hasData");
+        if (StringUtils.isNotBlank(hasData)) {
+            param.setHasData(Boolean.valueOf(hasData));
+        }
         return param;
     }