From 7f38b4524674a7fa501309140329324686ef179b Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Tue, 7 Jan 2025 16:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=B7=B2=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E4=BD=9C=E5=BA=9F=EF=BC=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/software/manage/mapper/RoleMapper.java   |  2 +-
 .../service/serviceimpl/PermissionServiceImpl.java    |  2 +-
 .../software/common/enums/FilePermission.java         | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RoleMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RoleMapper.java
index 1ae409b..114772b 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RoleMapper.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/RoleMapper.java
@@ -32,7 +32,7 @@ public interface RoleMapper extends BaseMapper<Role> {
             "LEFT JOIN " +
             "    ed_file_info f ON rp.file_id = f.id " +
             "LEFT JOIN" +
-            "    ed_user_role ur ON r.role_id = ur.user_id " +
+            "    ed_user_role ur ON r.role_id = ur.role_id " +
             "LEFT JOIN" +
             "    ed_users u ON ur.user_id = u.user_id " +
             "WHERE " +
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
index fe22891..e2d8a1e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/PermissionServiceImpl.java
@@ -102,7 +102,7 @@ public class PermissionServiceImpl implements PermissionService {
     @Override
     public Map<String, Boolean> transToMap(List<String> permissionCodes) {
         Map<String, Boolean> result = new HashMap<>();
-        List<String> allCodes = FilePermission.getAllCodes();
+        List<String> allCodes = FilePermission.getAllCodesExcludeView();
         for (String code : allCodes) {
             if (permissionCodes.contains(code)) {
                 result.put(code, true);
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
index d9a3c80..2003b35 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/FilePermission.java
@@ -44,6 +44,17 @@ public enum FilePermission {
         return codes;
     }
 
+    // 获取所有的code除了view
+    public static List<String> getAllCodesExcludeView() {
+        List<String> codes = new ArrayList<>();
+        for (FilePermission permission : FilePermission.values()) {
+            if (!permission.getCode().equals("view")) {
+                codes.add(permission.getCode());
+            }// 获取每个枚举实例的 code
+        }
+        return codes;
+    }
+
     // 获取权限代码
     public String getCode() {
         return code;