From 752a3837f184cd6411bf5579fde87b78ca1a7b34 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 9 Mar 2022 11:01:50 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=92=88=E5=AF=B9=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=AE=89=E5=85=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flyfish/framework/service/DepartmentService.java | 9 +++++----
 .../java/com/flyfish/framework/service/RoleService.java  | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
index 9853bc4..1f6f3df 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
@@ -20,10 +20,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
@@ -117,6 +114,10 @@ public class DepartmentService extends BaseReactiveServiceImpl<Department> {
                     ids.add(qo.getAdditional());
                     qo.setIds(ids);
                 }
+                // qo中ids为空，返回无效查询
+                if (CollectionUtils.isEmpty(qo.getIds())) {
+                    qo.setIds(Collections.singleton("null"));
+                }
                 return mono;
             }
         }
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
index e8c0675..e45f330 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
@@ -93,6 +93,9 @@ public class RoleService extends BaseReactiveServiceImpl<Role> {
                             if (CollectionUtils.isNotEmpty(qo.getAdditions())) {
                                 qo.getIds().addAll(qo.getAdditions());
                             }
+                            if (CollectionUtils.isEmpty(qo.getIds())) {
+                                return Flux.empty();
+                            }
                             return super.getList(qo);
                         });
             }