From 23fbdbccf61a5936083a0658642a985394f8474a Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 22 Dec 2021 21:41:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=9E=E7=8E=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=BD=93=E7=89=9B=E9=80=BC=E7=9A=84=E9=93=BE=E5=BC=8F=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/flyfish/framework/enums/UserStatus.java    | 2 +-
 .../java/com/flyfish/framework/auditor/AuthorizeAuditor.java | 5 ++++-
 .../com/flyfish/framework/controller/TreeController.java     | 4 ++++
 .../controller/reactive/ReactiveTreeController.java          | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java b/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java
index 43f7003..f536b96 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java
+++ b/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java
@@ -13,7 +13,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum UserStatus implements NamedEnum {
 
-    NORMAL("正常状态"), LOCKED("已锁定"), DISABLED("已禁用"), EXPIRED("已过期");
+    NORMAL("正常"), LOCKED("已锁定"), DISABLED("已禁用"), EXPIRED("已过期");
 
     private final String name;
 }
diff --git a/flyfish-data/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java b/flyfish-data/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java
index 9231f1f..af907c4 100644
--- a/flyfish-data/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java
+++ b/flyfish-data/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java
@@ -5,6 +5,10 @@ import com.flyfish.framework.domain.authorized.AuthorizedDomain;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+/**
+ * 作用域赋值审查
+ * @author wangyu
+ */
 @Component
 @RequiredArgsConstructor
 public class AuthorizeAuditor implements BeanAuditor<AuthorizedDomain> {
@@ -15,7 +19,6 @@ public class AuthorizeAuditor implements BeanAuditor<AuthorizedDomain> {
      * 对实体进行审查，并补全相关字段
      *
      * @param data 原数据
-     * @return 结果
      */
     @Override
     public void audit(AuthorizedDomain data) {
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java b/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java
index 553cfb9..831bab3 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java
@@ -36,6 +36,10 @@ public abstract class TreeController<T extends TreeDomain<T>, Q extends TreeQo<T
         // 第三步，筛选一级树深度
         List<T> topList = filtered.stream().filter(item -> null != item && TreeDomain.ROOT.equals(item.getParentId()))
                 .collect(Collectors.toList());
+        // 不是从根开始，直接查出
+        if (CollectionUtils.isEmpty(topList)) {
+            return Result.accept(filtered);
+        }
         // 第三步，根据父id的map填充根tree
         return Result.accept(applyChildren(topList, group));
     }
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java b/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java
index 76b6cb9..5edf066 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java
+++ b/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java
@@ -68,6 +68,10 @@ public abstract class ReactiveTreeController<T extends TreeDomain<T>, Q extends
         List<T> roots = filtered.stream()
                 .filter(item -> null != item && TreeDomain.ROOT.equals(item.getParentId()))
                 .collect(Collectors.toList());
+        // 不是从根开始，直接查出
+        if (CollectionUtils.isEmpty(roots)) {
+            return filtered;
+        }
         // 第四步，根据父id的map填充根tree
         return applyChildren(roots, group);
     }