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 8d3aa23..dc13d2f 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 @@ -661,7 +661,6 @@ public class ExportFileController { } } } - MultiSheetExcelExporter exporter = new MultiSheetExcelExporter(); //将表格时间区间取出来做标题 String title = bean.getMonth(); @@ -712,6 +711,11 @@ public class ExportFileController { dayTable.setEndDate(monthFirstAndLast.get(1)); if (bean.getOrgId() != null) { dayTable.setOrgId(String.valueOf(bean.getOrgId())); + }else{ + //受限于当前登录人 + if(!bean.getOrgList().isEmpty()){ + dayTable.setOrgList(bean.getOrgList()); + } } dayTable.setName(bean.getUserName()); headers.entrySet() @@ -721,6 +725,11 @@ public class ExportFileController { att.setAttCurrentMonth(bean.getMonth()); if (bean.getOrgId() != null) { att.setOrgId(bean.getOrgId()); + }else{ + //受限于当前登录人 + if(!bean.getOrgList().isEmpty()){ + att.setOrgList(bean.getOrgList()); + } } att.setUserName(bean.getUserName()); List list = attendanceDetailsService.getOutCountList(att);