diff --git a/common-api/src/main/java/cn/lili/controller/common/FileDirectoryController.java b/common-api/src/main/java/cn/lili/controller/common/FileDirectoryController.java index a6cad261..fd82a9c3 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileDirectoryController.java +++ b/common-api/src/main/java/cn/lili/controller/common/FileDirectoryController.java @@ -40,6 +40,7 @@ public class FileDirectoryController { @PostMapping public ResultMessage addSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) { fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name()); + fileDirectory.setOwnerId(UserContext.getCurrentUser().getId()); fileDirectoryService.save(fileDirectory); return ResultUtil.data(fileDirectory); } @@ -48,6 +49,7 @@ public class FileDirectoryController { @PutMapping public ResultMessage editSceneFileList(@RequestBody @Valid FileDirectory fileDirectory) { fileDirectory.setDirectoryType(UserContext.getCurrentUser().getRole().name()); + fileDirectory.setOwnerId(UserContext.getCurrentUser().getId()); fileDirectoryService.updateById(fileDirectory); return ResultUtil.data(fileDirectory); } diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileDirectoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileDirectoryServiceImpl.java index 4ba07bc7..01500951 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileDirectoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileDirectoryServiceImpl.java @@ -1,10 +1,12 @@ package cn.lili.modules.file.serviceimpl; 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.dto.FileDirectoryDTO; import cn.lili.modules.file.mapper.FileDirectoryMapper; import cn.lili.modules.file.service.FileDirectoryService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,8 +36,7 @@ public class FileDirectoryServiceImpl extends ServiceImpl getFileDirectoryList(String scene) { - - List fileDirectoryList = this.list(); + List fileDirectoryList = this.list(new LambdaQueryWrapper().eq(FileDirectory::getOwnerId, scene)); List fileDirectoryDTOList = new ArrayList<>(); fileDirectoryList.forEach(item -> {