From 0dbcce991d95e2f21b1184a7dd2a75f9102b7bb9 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 23 May 2022 14:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/file/excel/error/AbstractErrorExcelHandler.java     | 2 +-
 .../service/department/service/impl/DepartmentServiceImpl.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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<T> {
             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<DepartmentPO> listPOByNames(List<String> departmentNames) {
+        if (departmentNames == null || departmentNames.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("departmentNames", departmentNames);
         return listPO(params);