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 { 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 { if (CollectionUtils.isNotEmpty(qo.getAdditions())) { qo.getIds().addAll(qo.getAdditions()); } + if (CollectionUtils.isEmpty(qo.getIds())) { + return Flux.empty(); + } return super.getList(qo); }); }