diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java index 211844d..42ae593 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java @@ -1295,7 +1295,7 @@ public class ExportFileController { } /** - * 异常排名导出 + * 考勤明细异常排名导出 * * @param response * @param bean @@ -1350,8 +1350,9 @@ public class ExportFileController { dayTable.setStartDate(bean.getStartDate()); dayTable.setEndDate(bean.getEndDate()); dayTable.setName(bean.getUserName()); - if (bean.getOrgId() != null) { + if (bean.getOrgId() != null || bean.getOrgIds() != null) { dayTable.setOrgId(bean.getOrgId()); + dayTable.setOrgList(bean.getOrgIds()); }else{ //受限于当前登录人 if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){ @@ -1364,8 +1365,9 @@ public class ExportFileController { AttDataDetailsBean att = new AttDataDetailsBean(); att.setStartDate(bean.getStartDate()); att.setEndDate(bean.getEndDate()); - if (bean.getOrgId() != null) { + if (bean.getOrgId() != null || bean.getOrgIds() != null) { att.setOrgId(bean.getOrgId()); + att.setOrgList(bean.getOrgIds()); }else{ //受限于当前登录人 if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){ diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml index 9d972a5..c447faf 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml @@ -23,7 +23,7 @@ ) - + +