diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index a9542196..7e21d935 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -310,7 +310,7 @@ public class SysDepartController { mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepart.class); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:"+user.getRealname(), "导出信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } @@ -334,7 +334,7 @@ public class SysDepartController { for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); + params.setTitleRows(1); params.setHeadRows(1); params.setNeedSave(true); try { diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 45598acb..db76b5a0 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -463,7 +463,7 @@ public class SysDictController { mv.addObject(NormalExcelConstants.CLASS, SysDictPage.class); // 自定义表格参数 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "导出人:"+user.getRealname(), "数据字典")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "数据字典")); // 导出数据列表 mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; @@ -485,8 +485,8 @@ public class SysDictController { for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(2); + params.setTitleRows(1); + params.setHeadRows(1); params.setNeedSave(true); try { //导入Excel格式校验,看匹配的字段文本概率 diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 62cc6b75..f440a099 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -35,7 +35,6 @@ public class SysDepart implements Serializable { @Excel(name="机构/部门名称",width=15) private String departName; /**英文名*/ - @Excel(name="英文名",width=15) private String departNameEn; /**缩写*/ private String departNameAbbr; @@ -46,7 +45,7 @@ public class SysDepart implements Serializable { @Excel(name="描述",width=15) private String description; /**机构类别 1公司,2组织机构,2岗位*/ - @Excel(name="机构类别",width=15,dicCode="org_category") + @Excel(name="机构类别",width=15,dicCode="org_category",orderNum = "1") private String orgCategory; /**机构类型*/ private String orgType; @@ -54,16 +53,15 @@ public class SysDepart implements Serializable { @Excel(name="机构编码",width=15) private String orgCode; /**手机号*/ - @Excel(name="手机号",width=15) + @Excel(name="电话",width=15,orderNum = "2") private String mobile; /**传真*/ - @Excel(name="传真",width=15) private String fax; /**地址*/ - @Excel(name="地址",width=15) + @Excel(name="地址",width=15,orderNum = "3") private String address; /**备注*/ - @Excel(name="备注",width=15) + @Excel(name="备注",width=15,orderNum = "4") private String memo; /**状态(1启用,0不启用)*/ @Dict(dicCode = "depart_status")