electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.electromagnetic.industry.software.common.cons.ElectromagneticConstants;
 import com.electromagnetic.industry.software.common.enums.DataOwnEnum;
 import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
 import com.electromagnetic.industry.software.common.enums.EleDataStatusEnum;
@@ -84,25 +83,25 @@ public class PermissionServiceImpl implements PermissionService {
         String userId = UserThreadLocal.getUserId();
         List<String> roleIds = getRoles(userId);
 
-        if (CollUtil.isEmpty(roleIds)) {
+        if (roleIds == null || roleIds.isEmpty()) {
             return new ArrayList<>();
         }
+
         LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(RolePermission::getFileId)
                 .in(RolePermission::getRoleId, roleIds)
                 .eq(RolePermission::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(RolePermission::getPermissionCode, FilePermission.VIEW.getCode());
         List<String> ids = rolePermissionService.listObjs(queryWrapper1).stream().map(Object::toString).toList();
+
         if (CollUtil.isEmpty(ids)) {
             return new ArrayList<>();
         }
         Set<String> result = new HashSet<>();
         // 把父亲节点加上
-        List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
+        List<EdFileInfo> edFileInfos = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).in(EdFileInfo::getId, ids));
-                .select(EdFileInfo::getFilePath)
-                .in(EdFileInfo::getId, ids));
         for (EdFileInfo file : edFileInfos) {
-            String[] parentIds = file.getFilePath().split(ElectromagneticConstants.MYSQL_FILE_PATH_SPLIT);
+            String[] parentIds = file.getFilePath().split("_");
             result.addAll(Arrays.asList(parentIds));
         }
         return new ArrayList<>(result);

electrmangnetic/src/test/java/Test1.java

@@ -1,12 +1,15 @@
 import com.electromagnetic.industry.software.manage.Application;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.net.MalformedURLException;
+
 @SpringBootTest(classes = Application.class)
 public class Test1 {
 
-//    @Test
+    @Test
-//    public void test() throws MalformedURLException {
+    public void test() throws MalformedURLException {
-//
+
-//    }
+    }
 
 }