考勤列表适配sqlserver
This commit is contained in:
parent
081747b334
commit
b78e96c875
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue