Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

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 " +

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);

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;