Commit 78b4ac17 by 翁国栋

ios端上传bug

parent 09830dc0
......@@ -80,11 +80,13 @@ public class DiskFilesController {
@ApiOperation(value = "上传普通文件", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> upload(@CurrentUser UserBean userBean, @RequestParam(required = true) MultipartFile[] file,
@ApiParam("文件文件夹或共享空间ID") @RequestParam(required = false) Integer catalogueId,HttpServletRequest request) {
//如果不指定文件夹将选择该用户最近创建的第一级目录,ios端上传并没有指定文件夹
if(catalogueId<=0){
DiskCatalogue diskCatalogue = DiskCatalogue.builder().build().selectOne(new QueryWrapper<DiskCatalogue>().select("id")
.eq("org_id", userBean.getOrgCode())
.eq("parent_id",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)){
diskCatalogue = new DiskCatalogue();
......
......@@ -212,8 +212,8 @@ config-8timer:
# 文件存储地址类型:aliyun-oss(阿里云OSS),physics-oss(物理机器OSS)
# 默认存储物理机器OSS
file-address:
#type: physics-oss
type: aliyun-oss
type: physics-oss
# type: aliyun-oss
#导出zip临时地址
zip:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment