Refactor the classes of the RBAC to PermissionService.

src/main/java/com/myxrk/rbac/aspect/DataGridMaskAspect.java

@@ -50,8 +50,8 @@ public class DataGridMaskAspect {
                 return result;
                 return result;
             }
             }
 
 
-            Class<?> genericType = data.get(0).getClass();
-//            Type genericType= ((ParameterizedType)data.getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+            // 获取数据类型
+            Class<?> genericType = getDataEntryType(data);
 
 
             if (genericType == String.class) {
             if (genericType == String.class) {
                 return result;
                 return result;
@@ -75,7 +75,7 @@ public class DataGridMaskAspect {
             List<String> columns = permissionService.getColumnsByRoleAndDataGridKey(dgKey, role);
             List<String> columns = permissionService.getColumnsByRoleAndDataGridKey(dgKey, role);
 
 
 
 
-            maskData(data, columns, genericType);
+            maskData(data, columns);
 
 
             return result;
             return result;
         }
         }
@@ -85,7 +85,14 @@ public class DataGridMaskAspect {
         return result;
         return result;
     }
     }
 
 
-    private static void maskData(List<?> data, List<String> columns, Class<?> genericType) {
+    private static Class<?> getDataEntryType(List<?> data) {
+        return data.get(0).getClass();
+    }
+
+    private static void maskData(List<?> data, List<String> columns) {
+        // 获取数据类型
+        Class<?> genericType = getDataEntryType(data);
+
         // 获取返回值的属性列表
         // 获取返回值的属性列表
         Set<String> header = getTableHeader(genericType);
         Set<String> header = getTableHeader(genericType);
         if (!header.containsAll(columns)) {
         if (!header.containsAll(columns)) {