[Improvement] Support indeterminate keys with the permission configur…

…ation of role creation (#474)
apache · Jul 9, 2024 · 324e901 · 324e901
1 parent 036f8e2
commit 324e901
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/SysRole.java b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/SysRole.java
@@ -63,6 +63,10 @@ public class SysRole extends BaseModel {
     @NotEmpty(message = "invalid.menuIds")
     private Integer[] menuIds;
 
+    /** indeterminate keys. */
+    @TableField(exist = false)
+    private Integer[] indeterminateKeys;
+
     /** Role menu permissions. */
     @TableField(exist = false)
     private Set<String> permissions;

diff --git a/...eb-server/src/main/java/org/apache/paimon/web/server/service/impl/SysRoleServiceImpl.java b/...eb-server/src/main/java/org/apache/paimon/web/server/service/impl/SysRoleServiceImpl.java
@@ -195,22 +195,32 @@ public int updateRole(SysRole role) {
      * @param role role info
      */
     public int insertRoleMenu(SysRole role) {
+        Integer[] mergedMenuIds = mergeMenuIds(role.getMenuIds(), role.getIndeterminateKeys());
         int rows = 1;
-        if (role.getMenuIds() != null && role.getMenuIds().length > 0) {
+        if (mergedMenuIds.length > 0) {
             List<RoleMenu> list = new ArrayList<RoleMenu>();
-            for (Integer menuId : role.getMenuIds()) {
+            for (Integer menuId : mergedMenuIds) {
                 RoleMenu rm = new RoleMenu();
                 rm.setRoleId(role.getId());
                 rm.setMenuId(menuId);
                 list.add(rm);
             }
-            if (list.size() > 0) {
-                rows = roleMenuMapper.batchRoleMenu(list);
-            }
+            rows = roleMenuMapper.batchRoleMenu(list);
         }
         return rows;
     }
 
+    private Integer[] mergeMenuIds(Integer[] menuIds, Integer[] indeterminateKeys) {
+        Set<Integer> mergedSet = new HashSet<>();
+        if (menuIds != null) {
+            mergedSet.addAll(Arrays.asList(menuIds));
+        }
+        if (indeterminateKeys != null) {
+            mergedSet.addAll(Arrays.asList(indeterminateKeys));
+        }
+        return mergedSet.toArray(new Integer[0]);
+    }
+
     /**
      * Delete role.
      *