Merge pull request #119 from zzx1314/dev

feat: 使用模板导出的时候，不写入头

Author: lltx

src/main/java/com/pig4cloud/plugin/excel/handler/AbstractSheetWriteHandler.java

@@ -198,6 +198,9 @@ public WriteSheet sheet(Sheet sheet, Class<?> dataClass, String template,
 		// 是否模板写入
 		ExcelWriterSheetBuilder writerSheetBuilder = StringUtils.hasText(template) ? EasyExcel.writerSheet(sheetNo)
 				: EasyExcel.writerSheet(sheetNo, sheetName);
+		if (StringUtils.hasText(template)) {
+			bookHeadEnhancerClass = null;
+		}
 
 		// 头信息增强 1. 优先使用 sheet 指定的头信息增强 2. 其次使用 @ResponseExcel 中定义的全局头信息增强
 		Class<? extends HeadGenerator> headGenerateClass = null;
@@ -212,7 +215,9 @@ else if (isNotInterface(bookHeadEnhancerClass)) {
 			fillCustomHeadInfo(dataClass, bookHeadEnhancerClass, writerSheetBuilder);
 		}
 		else if (dataClass != null) {
-			writerSheetBuilder.head(dataClass);
+			if (!StringUtils.hasText(template)) {
+				writerSheetBuilder.head(dataClass);
+			}
 			if (sheet.excludes().length > 0) {
 				writerSheetBuilder.excludeColumnFieldNames(Arrays.asList(sheet.excludes()));
 			}
@@ -243,6 +248,9 @@ private void fillCustomHeadInfo(Class<?> dataClass, Class<? extends HeadGenerato
 	 * @return true 已指定 false 未指定(默认值)
 	 */
 	private boolean isNotInterface(Class<? extends HeadGenerator> headGeneratorClass) {
+		if (headGeneratorClass == null) {
+			return false;
+		}
 		return !Modifier.isInterface(headGeneratorClass.getModifiers());
 	}