diff --git a/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java b/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java index e0908b22..9a68dddc 100644 --- a/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java +++ b/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java @@ -39,7 +39,7 @@ public abstract class AbstractErrorExcelHandler { errorExcelPathFileFolder.mkdirs(); } // 文件名 - String fileName = String.format("%s.xls", UUIDUtil.get32UUID()); + String fileName = String.format("%s.xlsx", UUIDUtil.get32UUID()); // 表格头 File file = new File(String.format("%s/%s", errorExcelPath, fileName)); EasyExcel.write(file).sheet("错误清单").head(excelHeaderNames()).doWrite(excelErrors); diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java index 0dd9c57c..883469f4 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java @@ -541,6 +541,9 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart @Override public List listPOByNames(List departmentNames) { + if (departmentNames == null || departmentNames.isEmpty()) { + return new ArrayList<>(); + } Map params = getHashMap(2); params.put("departmentNames", departmentNames); return listPO(params);