caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: OSS资源增加按店铺筛选

Browse Source
This commit is contained in:
lele0521 2024-03-19 17:03:55 +08:00
parent ed3a2ae9fc
commit fcac4002b1
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common-api/src/main/java/cn/lili/controller/common/UploadController.java
View File

@ -108,6 +108,7 @@ public class UploadController {
newFile.setOwnerName(authUser.getStoreName()); newFile.setOwnerName(authUser.getStoreName());
} else { } else {
newFile.setOwnerId(authUser.getId()); newFile.setOwnerId(authUser.getId());
newFile.setOwnerName(authUser.getNickName());
} }
//存储文件目录 //存储文件目录

3
framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java
View File

@ -25,6 +25,9 @@ public class FileOwnerDTO extends PageVO {
@ApiModelProperty(value = "拥有者id") @ApiModelProperty(value = "拥有者id")
private String ownerId; private String ownerId;
@ApiModelProperty(value = "拥有者名称")
private String ownerName;
@ApiModelProperty(value = "用户类型") @ApiModelProperty(value = "用户类型")
private String userEnums; private String userEnums;

1
framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
View File

@ -88,6 +88,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements Fi
public IPage<File> customerPage(FileOwnerDTO fileOwnerDTO) { public IPage<File> customerPage(FileOwnerDTO fileOwnerDTO) {
LambdaQueryWrapper<File> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<File> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) 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()) .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()),File::getFileDirectoryId, fileOwnerDTO.getFileDirectoryId())
.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey())
.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType()) .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType())