From 15b45a270dd3ad29330a984cfb6b27785a1e701f Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 10 Jan 2025 17:51:20 +0800
Subject: [PATCH] clean code

---
 .../service/serviceimpl/CommonService.java    | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 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 b3a9b7c..4b9ede1 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
@@ -36,7 +36,6 @@ import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*;
@@ -45,7 +44,6 @@ import static com.electromagnetic.industry.software.common.cons.ElectromagneticC
 public class CommonService {
 
     private static final Map<String, String> FILE_TYPE_ENUM = new HashMap<>();
-    private static final Map<String, String> ID_NAME = new ConcurrentHashMap<>();
 
     static {
         FILE_TYPE_ENUM.put(EleDataTypeEnum.FOLDER.desc, "01");
@@ -83,8 +81,6 @@ public class CommonService {
 
     @Resource
     private FileSystemService fileSystemService;
-    @Autowired
-    private PermissionService permissionService;
 
     @PostConstruct
     public void init() {
@@ -143,18 +139,16 @@ public class CommonService {
 
     public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery, List<String> accessableIds) {
 
-        if (isAdminQuery) {
-            return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
-                   .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
-                   .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
-                   .eq(EdFileInfo::getParentId, id));
-        }
-        return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
+        LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
                 .eq(EdFileInfo::getPrjDir, true)
-                .in(EdFileInfo::getId, accessableIds)
-                .likeRight(EdFileInfo::getFilePath, id));
+                .likeRight(EdFileInfo::getFilePath, id);
+        if (!isAdminQuery) {
+            queryWrapper.in(EdFileInfo::getId, accessableIds);
+        }
+
+        return edFileInfoMapper.selectList(queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)