From 4c47d4aba201309875ba8301e27e37bbaca2cc94 Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Tue, 16 Jan 2024 15:53:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8C=BA=E5=88=86=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E3=80=81=E7=AE=A1=E7=90=86=E7=AB=AFOSS=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lili/controller/common/FileDirectoryController.java   | 2 ++
 .../modules/file/serviceimpl/FileDirectoryServiceImpl.java   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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 a6cad2613..fd82a9c36 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<FileDirectory> 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<FileDirectory> 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 4ba07bc75..015009511 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<FileDirectoryMapper, F
 
     @Override
     public List<FileDirectoryDTO> getFileDirectoryList(String scene) {
-
-        List<FileDirectory> fileDirectoryList = this.list();
+        List<FileDirectory> fileDirectoryList = this.list(new LambdaQueryWrapper<FileDirectory>().eq(FileDirectory::getOwnerId, scene));
         List<FileDirectoryDTO> fileDirectoryDTOList = new ArrayList<>();
 
         fileDirectoryList.forEach(item -> {