From 4c518d423fcaa79e44afab6d062f7d8efd6c2ff7 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Tue, 8 Mar 2022 22:26:40 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BC=98=E5=8C=96=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=92=8C=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flyfish/framework/domain/DepartmentQo.java     |  6 ++++++
 .../main/java/com/flyfish/framework/domain/RoleQo.java | 10 ++++++++++
 .../com/flyfish/framework/service/RoleService.java     |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java b/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java
index 24ccaa7..f00388b 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java
@@ -4,6 +4,7 @@ import com.flyfish.framework.domain.po.Department;
 import com.flyfish.framework.domain.tree.TreeQo;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 部门（校区）查询实体
@@ -18,4 +19,9 @@ public class DepartmentQo extends TreeQo<Department> {
      * 额外的参数，仅针对getList指定，一般用于回显父级部门
      */
     private String additional;
+
+    @Override
+    public boolean isEmpty() {
+        return super.isEmpty() && StringUtils.isBlank(additional);
+    }
 }
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java b/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java
index c4b4b72..bc842dd 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java
@@ -36,4 +36,14 @@ public class RoleQo extends NameLikeQo<Role> {
     public CriteriaBuilder<Role> criteriaBuilder() {
         return super.criteriaBuilder().with("admin", "system");
     }
+
+    /**
+     * 因存在不稳定因素，永不为空
+     *
+     * @return 结果
+     */
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
 }
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 4dda8cb..6b74504 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
@@ -90,7 +90,7 @@ public class RoleService extends BaseReactiveServiceImpl<Role> {
                         .flatMapMany(ids -> {
                             RoleQo qo = (RoleQo) query;
                             qo.setIds(ids);
-                            if (CollectionUtils.isEmpty(qo.getAdditions())) {
+                            if (CollectionUtils.isNotEmpty(qo.getAdditions())) {
                                 qo.getIds().addAll(qo.getAdditions());
                             }
                             return super.getList(qo);