electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoVO.java

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class FileInfoVO {
@@ -54,7 +53,4 @@ public class FileInfoVO {
 
     // 是否是个人数据，1是，0否
     private Integer isPersonal;
-
-    // 文件权限
-    private Map<String,Boolean> permissions;
 }

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

@@ -1,18 +1,10 @@
 package com.electromagnetic.industry.software.manage.service;
 
-import com.electromagnetic.industry.software.common.enums.FilePermission;
-
 import java.util.List;
 import java.util.Map;
 
 public interface PermissionService {
 
-    /**
-     * 用户对个人数据拥有所有权限
-     * @return
-     */
-    Map<String, Boolean> getPersonalPermission();
-
     /**
      * 查询当前用户在当前目录的功能权限
      *

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

@@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.electromagnetic.industry.software.common.enums.*;
-import com.electromagnetic.industry.software.common.enums.FilePermission;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.exception.PermissionDeniedException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
@@ -1421,11 +1420,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             e.setFileSizeShow(EleCommonUtil.convertFileSize(e.getFileSize()));
             e.setIsFavorite(isFavorite(UserThreadLocal.getUserId(), e.getId()) ? 1 : 0);
             e.setIsPersonal(e.getCreatedBy() == UserThreadLocal.getUserId() ? 1 : 0);
-            // 设置权限
-            Map<String, Boolean> permissions = (e.getIsPersonal() == 1)
-                    ? permissionService.getPersonalPermission()
-                    : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), false);
-            e.setPermissions(permissions);
         });
         UserThreadLocal.setSuccessInfo("", "", "查询了收藏列表");
         return fileInfoVOIPage;

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

@@ -30,15 +30,6 @@ public class PermissionServiceImpl implements PermissionService {
     @Resource
     EdFileInfoMapper edFileInfoMapper;
 
-    /**
-     * 用户对个人数据拥有所有权限
-     * @return
-     */
-    @Override
-    public Map<String, Boolean> getPersonalPermission() {
-        return transToMap(FilePermission.getAllCodes(), true);
-    }
-
     /**
      * 查询当前用户在当前目录的功能权限
      *
@@ -131,7 +122,7 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     public Map<String, Boolean> transToMap(List<String> permissionCodes, Boolean includeView) {
         Map<String, Boolean> result = new HashMap<>();
-        List<String> allCodes;
+        List<String> allCodes = new ArrayList<>();
         if (includeView.equals(Boolean.TRUE)) {
             allCodes = FilePermission.getAllCodes();
         } else {