From f659a3036205d6908b16ff419fa5bd7f32d974c7 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Tue, 19 Mar 2024 10:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/dataset/DatasetController.java   | 17 ++++++-----------
 .../managementPlatform/DatasetDaoMapper.xml     |  4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

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}
             </if>
             <if test="dataset.name != null and dataset.name != ''">
-                and name = #{dataset.name}
+                and name like "%"#{dataset.name}"%"
             </if>
             <if test="dataset.description != null and dataset.description != ''">
                 and description = #{dataset.description}
@@ -85,7 +85,7 @@
                 and id = #{dataset.id}
             </if>
             <if test="dataset.name != null and dataset.name != ''">
-                and name = #{dataset.name}
+                and name like "%"#{dataset.name}"%"
             </if>
             <if test="dataset.description != null and dataset.description != ''">
                 and description = #{dataset.description}