diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 2f258b9b..86440438 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -48,8 +48,11 @@ public class DatasetController { @ApiOperation("分页查询,根据available_range筛选,1公开0私有") public AjaxResult queryByPage(Dataset dataset, @RequestParam("page") int page, @RequestParam("size") int size, - @RequestParam("available_range") int availableRange) { + @RequestParam("available_range") int availableRange , + @RequestParam("data_type") int dataType) { dataset.setAvailableRange(availableRange); // 设置筛选条件 + dataset.setAvailableRange(dataType); // 设置筛选条件 + PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index 3be55979..50a4a4d4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -47,8 +47,10 @@ public class ModelsController { @ApiOperation("分页查询,根据available_range筛选,1公开0私有") public AjaxResult queryByPage(Models models, @RequestParam("page") int page, @RequestParam("size") int size, - @RequestParam("available_range") int availableRange) { + @RequestParam("available_range") int availableRange, + @RequestParam("model_type") int modelType) { models.setAvailableRange(availableRange); // 设置筛选条件 + models.setAvailableRange(modelType); // 设置筛选条件 PageRequest pageRequest = PageRequest.of(page, size); return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); }