From fcac4002b1dd1c97a04124384d232b2cc6cb608e Mon Sep 17 00:00:00 2001 From: lele0521 Date: Tue, 19 Mar 2024 17:03:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20OSS=E8=B5=84=E6=BA=90=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8C=89=E5=BA=97=E9=93=BA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/controller/common/UploadController.java | 1 + .../java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java | 3 +++ .../java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java | 1 + 3 files changed, 5 insertions(+) diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index bd11e6244..699291e30 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -108,6 +108,7 @@ public class UploadController { newFile.setOwnerName(authUser.getStoreName()); } else { newFile.setOwnerId(authUser.getId()); + newFile.setOwnerName(authUser.getNickName()); } //存储文件目录 diff --git a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java index 291ef3501..83cffd73c 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java @@ -25,6 +25,9 @@ public class FileOwnerDTO extends PageVO { @ApiModelProperty(value = "拥有者id") private String ownerId; + @ApiModelProperty(value = "拥有者名称") + private String ownerName; + @ApiModelProperty(value = "用户类型") private String userEnums; diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index 623f9dab8..56b492b9e 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -88,6 +88,7 @@ public class FileServiceImpl extends ServiceImpl implements Fi public IPage customerPage(FileOwnerDTO fileOwnerDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerName()), File::getOwnerName, fileOwnerDTO.getOwnerName()) .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()),File::getFileDirectoryId, fileOwnerDTO.getFileDirectoryId()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType())