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 4e9c925d..4e38978b 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
@@ -49,30 +49,25 @@ public class DatasetController {
* @return 查询结果
*/
@GetMapping
- @ApiOperation("数据集广场公开数据集分页查询,根据available_range筛选,1公开0私有")
+ @ApiOperation("数据集广场公开数据集分页查询1公开0私有")
public AjaxResult queryByPage(Dataset dataset, @RequestParam("page") int page,
- @RequestParam("size") int size,
- //@RequestParam("available_range") int availableRange ,
- @RequestParam(value = "data_type", required = false) String dataType) {
+ @RequestParam("size") int size) {
- if (dataType != null) { // 仅当dataType有值时设置
- dataset.setDataType(dataType);
- }
+ dataset.setAvailableRange(1);
PageRequest pageRequest = PageRequest.of(page, size);
return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest));
}
@GetMapping("/personalDatasets")
- @ApiOperation("分页查询当前用户的个人数据集,根据data_type筛选")
+ @ApiOperation("分页查询当前用户的个人数据集")
public AjaxResult queryByPagePersonal(Dataset dataset, @RequestParam("page") int page,
- @RequestParam("size") int size,
- @RequestParam(value = "data_type", required = false) String dataType) {
+ @RequestParam("size") int size) {
// 获取当前用户的认证信息
LoginUser loginUser = SecurityUtils.getLoginUser();
// 设置筛选条件
dataset.setCreateBy(loginUser.getUsername());
- dataset.setDataType(dataType); // 根据传入的参数设置数据类型
+ dataset.setAvailableRange(0);
PageRequest pageRequest = PageRequest.of(page, size);
return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest));
}
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
index a8bd42d9..ac1a5b3c 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetDaoMapper.xml
@@ -42,7 +42,7 @@
and id = #{dataset.id}
- and name = #{dataset.name}
+ and name like "%"#{dataset.name}"%"
and description = #{dataset.description}
@@ -85,7 +85,7 @@
and id = #{dataset.id}
- and name = #{dataset.name}
+ and name like "%"#{dataset.name}"%"
and description = #{dataset.description}