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-01-16 15:53:37 +08:00
parent 7f9061cfc5
commit 4c47d4aba2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common-api/src/main/java/cn/lili/controller/common/FileDirectoryController.java
View File

@ -40,6 +40,7 @@ public class FileDirectoryController {
@PostMapping @PostMapping
public ResultMessage<FileDirectory> addSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) { public ResultMessage<FileDirectory> addSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) {
fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name()); fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name());
fileDirectory.setOwnerId(UserContext.getCurrentUser().getId());
fileDirectoryService.save(fileDirectory); fileDirectoryService.save(fileDirectory);
return ResultUtil.data(fileDirectory); return ResultUtil.data(fileDirectory);
} }
@ -48,6 +49,7 @@ public class FileDirectoryController {
@PutMapping @PutMapping
public ResultMessage<FileDirectory> editSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) { public ResultMessage<FileDirectory> editSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) {
fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name()); fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name());
fileDirectory.setOwnerId(UserContext.getCurrentUser().getId());
fileDirectoryService.updateById(fileDirectory); fileDirectoryService.updateById(fileDirectory);
return ResultUtil.data(fileDirectory); return ResultUtil.data(fileDirectory);
} }

5
framework/src/main/java/cn/lili/modules/file/serviceimpl/FileDirectoryServiceImpl.java
View File

@ -1,10 +1,12 @@
package cn.lili.modules.file.serviceimpl; package cn.lili.modules.file.serviceimpl;
import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.enums.UserEnums;
import cn.lili.modules.distribution.entity.dos.DistributionOrder;
import cn.lili.modules.file.entity.FileDirectory; import cn.lili.modules.file.entity.FileDirectory;
import cn.lili.modules.file.entity.dto.FileDirectoryDTO; import cn.lili.modules.file.entity.dto.FileDirectoryDTO;
import cn.lili.modules.file.mapper.FileDirectoryMapper; import cn.lili.modules.file.mapper.FileDirectoryMapper;
import cn.lili.modules.file.service.FileDirectoryService; import cn.lili.modules.file.service.FileDirectoryService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -34,8 +36,7 @@ public class FileDirectoryServiceImpl extends ServiceImpl<FileDirectoryMapper, F
@Override @Override
public List<FileDirectoryDTO> getFileDirectoryList(String scene) { public List<FileDirectoryDTO> getFileDirectoryList(String scene) {
List<FileDirectory> fileDirectoryList = this.list(new LambdaQueryWrapper<FileDirectory>().eq(FileDirectory::getOwnerId, scene));
List<FileDirectory> fileDirectoryList = this.list();
List<FileDirectoryDTO> fileDirectoryDTOList = new ArrayList<>(); List<FileDirectoryDTO> fileDirectoryDTOList = new ArrayList<>();
fileDirectoryList.forEach(item -> { fileDirectoryList.forEach(item -> {