From 70e8af9edd128c44e2003849c6372daf91ddc6a5 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 21 Apr 2022 18:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/department/impl/DepartmentServiceImpl.java      | 3 +++
 .../service/department/impl/DepartmentUserServiceImpl.java  | 3 +++
 .../department/service/impl/DepartmentServiceImpl.java      | 3 +++
 .../department/service/impl/DepartmentUserServiceImpl.java  | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
index 37441ba3..665dbc03 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentServiceImpl.java
@@ -45,6 +45,9 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
 
     @Override
     public List<DepartmentDTO> listByIds(List<String> ids) {
+        if(ids.isEmpty()) {
+            return new ArrayList<>();
+        }
         IdsVO idsVO = new IdsVO();
         idsVO.setIds(ids);
         return departmentRemoteService.listByIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java
index f23a06d0..2225d0a9 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java
@@ -56,6 +56,9 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
 
     @Override
     public List<DepartmentUserDTO> listByUserIds(List<String> userIds) {
+        if (userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
         IdsVO idsVO = new IdsVO();
         idsVO.setIds(userIds);
         return departmentUserRemoteService.listByUserIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO);
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 20c2c04d..d4b95783 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
@@ -221,6 +221,9 @@ public class DepartmentServiceImpl extends DefaultBaseService implements IDepart
 
     @Override
     public List<DepartmentDTO> listByIds(List<String> ids) {
+        if (ids.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("departmentIds", ids);
         return list(params);
diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
index 463c16bd..2dab3fd1 100644
--- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
+++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java
@@ -209,6 +209,9 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
 
     @Override
     public List<DepartmentUserDTO> listByUserIds(List<String> userIds) {
+        if (userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("userIds", userIds);
         return list(params);
@@ -462,6 +465,9 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe
 
     @Override
     public List<String> listDepartmentIdByUserIds(List<String> userIds) {
+        if (userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("userIds", userIds);
         return departmentUserDao.listDepartmentId(params);