diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/BeanUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/BeanUtil.java index 77f66df9..d4404991 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/BeanUtil.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/BeanUtil.java @@ -109,15 +109,16 @@ public class BeanUtil extends cn.hutool.core.bean.BeanUtil { */ public static Map processExcelAnnotationToMap(@NotNull Class clazz) { Map result = new ConcurrentHashMap<>(16); + final Class cls = ExcelProperty.class; Arrays.stream(clazz.getDeclaredFields()) // 过滤有指定注解的属性 - .filter(declaredField -> ObjectUtil.isNotNull(AnnotationUtils.findAnnotation(declaredField, ExcelProperty.class))) + .filter(declaredField -> ObjectUtil.isNotNull(AnnotationUtils.findAnnotation(declaredField, cls))) // 根据index属性排序,并放置到Map的返回值中 - .sorted(Comparator.comparingInt(o -> AnnotationUtils.findAnnotation(o, ExcelProperty.class).index())) + .sorted(Comparator.comparingInt(o -> AnnotationUtils.findAnnotation(o, cls).index())) // 有序执行 .forEachOrdered(field -> { - ExcelProperty annotation = AnnotationUtils.findAnnotation(field, ExcelProperty.class); + ExcelProperty annotation = AnnotationUtils.findAnnotation(field, cls); String title = annotation.value()[0]; result.put(field.getName(), title); });