Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6cda44af74fe63b2e276af3228c7bca00dec7ffa

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java

@@ -206,8 +206,8 @@
       request.setPageNum(1);
      List<EmpBaseInfo> exportList = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
      List<Map<String, Object>> listMapDicItem = new ArrayList();
      List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
      String fileName = "在职员工列表";
      List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
      String fileName = "员工列表";
      Date currentDate = new Date();
      String dateStr = DateUtil.formatDate(currentDate);
      boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);