|
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.ExcelWriter;
|
|
|
import com.alibaba.excel.write.metadata.WriteSheet;
|
|
|
+import com.alibaba.excel.write.metadata.fill.FillConfig;
|
|
|
import com.google.common.base.Strings;
|
|
|
import com.malk.server.common.McException;
|
|
|
import com.malk.server.common.McREnum;
|
|
@@ -238,9 +239,10 @@ public class UtilExcel {
|
|
|
UtilExcel.setResponseHeader(response, fileName, ".xlsx");
|
|
|
ExcelWriter workBook = EasyExcel.write(response.getOutputStream(), dtoClass).withTemplate(inputStream).build();
|
|
|
WriteSheet sheet = EasyExcel.writerSheet().build();
|
|
|
+ FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
|
|
|
// 先单组数据填充,再多组数据填充
|
|
|
workBook.fill(dataMain, sheet);
|
|
|
- workBook.fill(dataList, sheet);
|
|
|
+ workBook.fill(dataList, fillConfig, sheet);
|
|
|
workBook.finish();
|
|
|
}
|
|
|
|