wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !372 from 伤枫落月/master

Browse Source
This commit is contained in:
伤枫落月
2024-06-29 14:47:45 +00:00
committed by Gitee
parent 095f3a126f af2cba291d
commit 53a009d5e0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
View File

@@ -1290,16 +1290,21 @@ public class ExcelUtil<T>
Excel attr = field.getAnnotation(Excel.class); Excel attr = field.getAnnotation(Excel.class);
if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
{ {
field.setAccessible(true); if (Collection.class.isAssignableFrom(field.getType()))
fields.add(new Object[] { field, attr }); {
} subMethod = getSubMethod(field.getName(), clazz);
if (Collection.class.isAssignableFrom(field.getType())) ParameterizedType pt = (ParameterizedType) field.getGenericType();
{ Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
subMethod = getSubMethod(field.getName(), clazz); this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
ParameterizedType pt = (ParameterizedType) field.getGenericType(); }
Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0]; else
this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class); {
field.setAccessible(true);
fields.add(new Object[] { field, attr });
}
} }
} }
// 多注解 // 多注解