查看我的数据集。

application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetManageController.java

 package com.yice.webadmin.app.controller;
 
+import cn.hutool.core.util.BooleanUtil;
 import com.github.pagehelper.page.PageMethod;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yice.common.core.annotation.MyRequestBody;
@@ -143,6 +144,9 @@ public class DatasetManageController {
         }
         DatasetManage datasetManageFilter = MyModelUtil.copyTo(datasetManageDtoFilter, DatasetManage.class);
         String orderBy = MyOrderParam.buildOrderBy(orderParam, DatasetManage.class);
+        //查询我的数据集，如果是管理员可以查询所有，否则只能查看自己
+        TokenData tokenData = TokenData.takeFromRequest();
+        datasetManageFilter.setCreateUserId(BooleanUtil.isTrue(tokenData.getIsAdmin()) ? null : tokenData.getUserId());
         List<DatasetManage> datasetManageList =
                 datasetManageService.getDatasetManageGroupList(datasetManageFilter, orderBy);
         return ResponseResult.success(MyPageUtil.makeResponseData(datasetManageList, DatasetManage.INSTANCE));

application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetVersionController.java

@@ -2,6 +2,7 @@ package com.yice.webadmin.app.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -47,7 +48,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.DecimalFormat;
 import java.util.*;
 
 /**
@@ -211,6 +211,9 @@ public class DatasetVersionController {
         DatasetVersion datasetVersionFilter = MyModelUtil.copyTo(datasetVersionDtoFilter, DatasetVersion.class);
         DatasetDetail datasetDetailFilter = MyModelUtil.copyTo(datasetDetailDtoFilter, DatasetDetail.class);
         String orderBy = MyOrderParam.buildOrderBy(orderParam, DatasetVersion.class);
+        //查询我的数据集，如果是管理员可以查询所有，否则只能查看自己
+        TokenData tokenData = TokenData.takeFromRequest();
+        datasetVersionFilter.setCreateUserId(BooleanUtil.isTrue(tokenData.getIsAdmin()) ? null : tokenData.getUserId());
         List<DatasetVersion> datasetVersionList =
                 datasetVersionService.getDatasetVersionListWithRelation(datasetVersionFilter, datasetDetailFilter, orderBy);
         if(CollUtil.isNotEmpty(datasetVersionList)){

application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetManageMapper.xml

@@ -55,6 +55,9 @@
             <if test="datasetManageFilter.datasetId != null">
                 AND lmp_dataset_manage.dataset_id = #{datasetManageFilter.datasetId}
             </if>
+            <if test="datasetManageFilter.createUserId != null">
+                AND lmp_dataset_manage.create_user_id = #{datasetManageFilter.createUserId}
+            </if>
             <if test="datasetManageFilter.datasetName != null and datasetManageFilter.datasetName != ''">
                 AND lmp_dataset_manage.dataset_name = #{datasetManageFilter.datasetName}
             </if>

application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetVersionMapper.xml

@@ -82,6 +82,9 @@
             <if test="datasetVersionFilter.datasetVersion != null and datasetVersionFilter.datasetVersion != ''">
                 AND lmp_dataset_version.dataset_version = #{datasetVersionFilter.datasetVersion}
             </if>
+            <if test="datasetVersionFilter.createUserId != null">
+                AND lmp_dataset_version.create_user_id = #{datasetVersionFilter.createUserId}
+            </if>
             <if test="datasetVersionFilter.datasetId != null">
                 AND lmp_dataset_version.dataset_id = #{datasetVersionFilter.datasetId}
             </if>