月报表导出添加组织权限
This commit is contained in:
parent
61935d5704
commit
ac54c8abda
|
|
@ -661,7 +661,6 @@ public class ExportFileController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MultiSheetExcelExporter exporter = new MultiSheetExcelExporter();
|
MultiSheetExcelExporter exporter = new MultiSheetExcelExporter();
|
||||||
//将表格时间区间取出来做标题
|
//将表格时间区间取出来做标题
|
||||||
String title = bean.getMonth();
|
String title = bean.getMonth();
|
||||||
|
|
@ -712,6 +711,11 @@ public class ExportFileController {
|
||||||
dayTable.setEndDate(monthFirstAndLast.get(1));
|
dayTable.setEndDate(monthFirstAndLast.get(1));
|
||||||
if (bean.getOrgId() != null) {
|
if (bean.getOrgId() != null) {
|
||||||
dayTable.setOrgId(String.valueOf(bean.getOrgId()));
|
dayTable.setOrgId(String.valueOf(bean.getOrgId()));
|
||||||
|
}else{
|
||||||
|
//受限于当前登录人
|
||||||
|
if(!bean.getOrgList().isEmpty()){
|
||||||
|
dayTable.setOrgList(bean.getOrgList());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dayTable.setName(bean.getUserName());
|
dayTable.setName(bean.getUserName());
|
||||||
headers.entrySet()
|
headers.entrySet()
|
||||||
|
|
@ -721,6 +725,11 @@ public class ExportFileController {
|
||||||
att.setAttCurrentMonth(bean.getMonth());
|
att.setAttCurrentMonth(bean.getMonth());
|
||||||
if (bean.getOrgId() != null) {
|
if (bean.getOrgId() != null) {
|
||||||
att.setOrgId(bean.getOrgId());
|
att.setOrgId(bean.getOrgId());
|
||||||
|
}else{
|
||||||
|
//受限于当前登录人
|
||||||
|
if(!bean.getOrgList().isEmpty()){
|
||||||
|
att.setOrgList(bean.getOrgList());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
att.setUserName(bean.getUserName());
|
att.setUserName(bean.getUserName());
|
||||||
List<AttDataDetailsBean> list = attendanceDetailsService.getOutCountList(att);
|
List<AttDataDetailsBean> list = attendanceDetailsService.getOutCountList(att);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue