From 8b23fb63d687c08d5428156fa132e63d957d7f8c Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 8 Jan 2025 14:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9B=AE=E5=BD=95=E6=A0=91=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java | 4 ++--
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 7 ++++++-
 .../manage/service/serviceimpl/EdPrjServiceImpl.java       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index 45545de..324ad01 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -211,7 +211,7 @@ public class CommonService {
         }
     }
 
-    public List<String> queryAllPrjInfo(boolean isAdminQuery) {
+    public List<String> queryAllPrjInfo(boolean isAdminQuery, List<String> prjIds) {
 
         try {
             LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
@@ -219,7 +219,7 @@ public class CommonService {
                     .eq(EdFileInfo::getParentId, PRJ_PARENT_ID)
                     .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
             if (!isAdminQuery) {
-                queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code);
+                queryWrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code).in(EdFileInfo::getId, prjIds);
             }
             List<String> ids = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 7214323..7e9727c 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -171,7 +171,11 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public ElectromagneticResult<?> tree() {
-        List<String> strings = commonService.queryAllPrjInfo(false);
+        List<String> prjIds = permissionService.getAccessibleTree();
+        if (CollUtil.isEmpty(prjIds)) {
+            return ElectromagneticResultUtil.success(new ArrayList<>());
+        }
+        List<String> strings = commonService.queryAllPrjInfo(false, prjIds);
         List<FileProjectVO> res = new ArrayList<>();
         strings.forEach(e -> {
             FileProjectVO fileProjectVO = JSONUtil.toList(e, FileProjectVO.class).get(0);
@@ -686,6 +690,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     @Transactional(rollbackFor = Exception.class)
     public ElectromagneticResult<?> upload(String parentId, MultipartFile file, Integer strategy) {
 
+        Assert.isTrue(!file.isEmpty(), "禁止上传空文件");
         Assert.isTrue(EleCommonUtil.isFileNameValid(file.getOriginalFilename()), NAME_VALID_MSG);
         // 查找下一层，看是否存在顶级定义相关文件，如果存在，则该层属于管理员层级定义的，不允许上传文件
         long dirCount = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 6d8b03a..c4346ff 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -222,7 +222,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
      */
     @Override
     public ElectromagneticResult<?> queryAllPrjInfo() {
-        List<String> res = commonService.queryAllPrjInfo(true);
+        List<String> res = commonService.queryAllPrjInfo(true, null);
         List<ProjectVO> projectVOS = new ArrayList<>();
         res.forEach(e -> {
             ProjectVO projectVO = JSONUtil.toList(e, ProjectVO.class).get(0);