Explorar o código

数据集选择修改,筛选框修改

wangyi %!s(int64=3) %!d(string=hai) anos
pai
achega
63e12d1068

+ 7 - 0
src/main/java/io/renren/modules/sys/controller/dataset/DataSetController.java

@@ -136,6 +136,13 @@ public class DataSetController {
         return R.ok().put("list",list);
     }
 
+    @GetMapping("/listAllDyDataset")
+    public R listAllDyDataset() throws Exception {
+        List<FileTest> list=MinIoUtils.listBucketFiles("dydataset");
+
+        return R.ok().put("list",list);
+    }
+
     /**
      * Description 下载数据集
      * @param datasetName

+ 1 - 1
src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java

@@ -53,7 +53,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 		//增加用户筛选的功能
 		int status = -1;
 		String tmp = (String)params.get("status");
-		if(!tmp.equals("-1")) {
+		if(tmp!=null&&!tmp.equals("-1")) {
 			status = Integer.valueOf(tmp);
 			IPage<SysUserEntity> page = this.page(
 					new Query<SysUserEntity>().getPage(params),