Skip to content

Commit

Permalink
Merge pull request #3170 from alibaba/bugfix
Browse files Browse the repository at this point in the history
修改文档异常
  • Loading branch information
zhuangjiaju authored May 4, 2023
2 parents 93f8d9e + 9458f92 commit 0915504
Showing 1 changed file with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.alibaba.excel.util;

import java.io.FileWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
Expand All @@ -14,7 +13,6 @@
import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;

import com.alibaba.excel.annotation.ExcelIgnore;
Expand All @@ -35,7 +33,6 @@
import com.alibaba.excel.metadata.property.FontProperty;
import com.alibaba.excel.metadata.property.NumberFormatProperty;
import com.alibaba.excel.metadata.property.StyleProperty;
import com.alibaba.excel.write.metadata.fill.FillWrapper;
import com.alibaba.excel.write.metadata.holder.WriteHolder;

import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -274,10 +271,8 @@ private static Map<String, ExcelContentProperty> doDeclaredFieldContentMap(Class
/**
* Parsing field in the class
*
* @param clazz Need to parse the class
* @param needIgnore If you want to ignore fields need to ignore
* @param holder holder
* @param cacheLocation cache lcation
* @param clazz Need to parse the class
* @param configurationHolder configuration
*/
public static FieldCache declaredFields(Class<?> clazz, ConfigurationHolder configurationHolder) {
switch (configurationHolder.globalConfiguration().getFiledCacheLocation()) {
Expand Down Expand Up @@ -431,7 +426,8 @@ private static void resortField(WriteHolder writeHolder, FieldCache fieldCache)
}
}

private static Map<Integer, FieldWrapper> buildSortedAllFieldMap(Map<Integer, List<FieldWrapper>> orderFieldMap, Map<Integer, FieldWrapper> indexFieldMap) {
private static Map<Integer, FieldWrapper> buildSortedAllFieldMap(Map<Integer, List<FieldWrapper>> orderFieldMap,
Map<Integer, FieldWrapper> indexFieldMap) {

Map<Integer, FieldWrapper> sortedAllFieldMap = new HashMap<>(
(orderFieldMap.size() + indexFieldMap.size()) * 4 / 3 + 1);
Expand Down

0 comments on commit 0915504

Please sign in to comment.