支持自定义隐藏属性列过滤子对象(I6GKPE)

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -1440,7 +1440,8 @@ public class ExcelUtil<T>
                     Excel[] excels = attrs.value();
                     for (Excel attr : excels)
                     {
-                        if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+                        if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+                                && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
                         {
                             field.setAccessible(true);
                             fields.add(new Object[] { field, attr });

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -106,7 +106,7 @@ public class DataScopeAspect
                 continue;
             }
             if (DATA_SCOPE_ALL.equals(dataScope))
-            {                                
+            {
                 sqlString = new StringBuilder();
                 conditions.add(dataScope);
                 break;