diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java index 29e010b8..2eee8bb1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java @@ -47,6 +47,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -91,6 +92,11 @@ public class BasicClazzController extends BladeController { @Operation(summary = "list分页", description = "传入BasicClazz Obj") public R> list(@Parameter(hidden = true) @RequestParam Map basicClazz, Query query) { + basicClazz = basicClazz + .entrySet() + .stream() + .filter(entry -> Objects.nonNull(entry.getValue())) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); QueryWrapper qw = Condition.getQueryWrapper(basicClazz, BasicClazz.class); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = BasicClazzWrapper.build().pageVO(pages);