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 { @@ -15,7 +19,6 @@ public class AuthorizeAuditor implements BeanAuditor { * 对实体进行审查,并补全相关字段 * * @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, Q extends TreeQo 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, Q extends List 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); }