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) ORDER BY t1.id DESC 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; }