From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common/src/main/java/com/ycl/common/utils/excel/OutputExcelUtils.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/src/main/java/com/ycl/common/utils/excel/OutputExcelUtils.java b/common/src/main/java/com/ycl/common/utils/excel/OutputExcelUtils.java
index 68d0bac..b1d2fb8 100644
--- a/common/src/main/java/com/ycl/common/utils/excel/OutputExcelUtils.java
+++ b/common/src/main/java/com/ycl/common/utils/excel/OutputExcelUtils.java
@@ -5,6 +5,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.ycl.common.utils.excel.convert.ExcelBigNumberConvert;
@@ -21,6 +22,7 @@
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.nio.file.Files;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -155,8 +157,10 @@
public static <T> @NotNull Set<Integer> getSelectFields(List<String> fieldNames, Class<T> clazz) {
Set<Integer> selectedIndexes = new HashSet<>();
if (CollUtil.isNotEmpty(fieldNames)) {
- // 鍙嶅皠鑾峰彇瀛楁灞炴��
- Field[] declaredFields = clazz.getDeclaredFields();
+ // 鍙嶅皠鑾峰彇瀛楁灞炴��,杩欓噷鍙幏鍙杄asyExcel娉ㄨВ鐨勫瓧娈�
+ Field[] declaredFields = Arrays.stream(clazz.getDeclaredFields())
+ .filter(field -> field.isAnnotationPresent(ExcelProperty.class))
+ .toArray(Field[]::new);
// // 鍖归厤闇�瑕佸鍏ョ殑瀛楁
for (int i = 0; i < declaredFields.length; i++) {
if (fieldNames.contains(declaredFields[i].getName())) {
--
Gitblit v1.8.0