diff --git a/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index d359101..b8c43cd 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/physical-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -41,9 +41,9 @@ public class JeecgController> { * issues/2933 JeecgController注入service时改用protected修饰,能避免重复引用service */ @Autowired - protected S service; + protected S service; @Resource - private JeecgBaseConfig jeecgBaseConfig; + private JeecgBaseConfig jeecgBaseConfig; /** * 导出excel @@ -70,7 +70,8 @@ public class JeecgController> { mv.addObject(NormalExcelConstants.FILE_NAME, title); mv.addObject(NormalExcelConstants.CLASS, clazz); //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- - ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + Optional.ofNullable(sysUser).map(v -> v.getRealname()) + .orElse(""), title); exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- mv.addObject(NormalExcelConstants.PARAMS, exportParams); @@ -89,7 +90,8 @@ public class JeecgController> { * @param pageNum 每个sheet的数据条数 * @param request */ - protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class clazz, String title, String exportFields, Integer pageNum) { + protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class clazz, String title, String exportFields, + Integer pageNum) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -111,7 +113,8 @@ public class JeecgController> { IPage pageList = service.page(page, queryWrapper); List exportList = pageList.getRecords(); Map map = new HashMap<>(5); - ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title + i, jeecgBaseConfig.getPath().getUpload()); + ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title + i, + jeecgBaseConfig.getPath().getUpload()); exportParams.setType(ExcelType.XSSF); //map.put("title",exportParams); //表格Title @@ -130,7 +133,6 @@ public class JeecgController> { return mv; } - /** * 根据权限导出excel,传入导出字段参数 *