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 { "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 transToMap(List permissionCodes) { Map result = new HashMap<>(); - List allCodes = FilePermission.getAllCodes(); + List 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 getAllCodesExcludeView() { + List 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;