ios端上传bug

src/main/java/cn/timer/api/controller/disk/DiskFilesController.java

@@ -80,11 +80,13 @@ public class DiskFilesController {
     @ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
     @ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
     public Result<Object> upload(@CurrentUser UserBean userBean, @RequestParam(required = true) MultipartFile[] file,
     public Result<Object> upload(@CurrentUser UserBean userBean, @RequestParam(required = true) MultipartFile[] file,
                                  @ApiParam("文件文件夹或共享空间ID") @RequestParam(required = false) Integer catalogueId,HttpServletRequest request) {
                                  @ApiParam("文件文件夹或共享空间ID") @RequestParam(required = false) Integer catalogueId,HttpServletRequest request) {
+        //如果不指定文件夹将选择该用户最近创建的第一级目录，ios端上传并没有指定文件夹
         if(catalogueId<=0){
         if(catalogueId<=0){
             DiskCatalogue diskCatalogue = DiskCatalogue.builder().build().selectOne(new QueryWrapper<DiskCatalogue>().select("id")
             DiskCatalogue diskCatalogue = DiskCatalogue.builder().build().selectOne(new QueryWrapper<DiskCatalogue>().select("id")
                     .eq("org_id", userBean.getOrgCode())
                     .eq("org_id", userBean.getOrgCode())
+                    .eq("parent_id",0)
                     .eq("delete_flag",0)
                     .eq("delete_flag",0)
-                    .eq("create_user_id",userBean.getEmpNum()).orderByAsc("create_time")
+                    .eq("create_user_id",userBean.getEmpNum()).orderByDesc("create_time")
             );
             );
             if(StringUtils.isEmpty(diskCatalogue)){
             if(StringUtils.isEmpty(diskCatalogue)){
                 diskCatalogue = new DiskCatalogue();
                 diskCatalogue = new DiskCatalogue();

src/main/resources/application-pro.yml

@@ -212,8 +212,8 @@ config-8timer:
   # 文件存储地址类型：aliyun-oss(阿里云OSS)，physics-oss(物理机器OSS)
   # 文件存储地址类型：aliyun-oss(阿里云OSS)，physics-oss(物理机器OSS)
   # 默认存储物理机器OSS
   # 默认存储物理机器OSS
   file-address:
   file-address:
-    #type: physics-oss
-    type: aliyun-oss
+    type: physics-oss
+#    type: aliyun-oss
 
 
 #导出zip临时地址
 #导出zip临时地址
 zip:
 zip: