diff --git a/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java index 8ba8bd2c..7d8e1b46 100644 --- a/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java @@ -18,7 +18,7 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl @Override protected void setHeadCellStyle(CellWriteHandlerContext context) { - if (!continueProcessing(context)) { + if (stopProcessing(context)) { return; } WriteCellData cellData = context.getCellDataList().get(0); @@ -27,7 +27,7 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl @Override protected void setContentCellStyle(CellWriteHandlerContext context) { - if (!continueProcessing(context)) { + if (stopProcessing(context)) { return; } WriteCellData cellData = context.getCellDataList().get(0); @@ -64,11 +64,11 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl + "'contentCellStyle(Head head)' must be implemented."); } - protected boolean continueProcessing(CellWriteHandlerContext context) { + protected boolean stopProcessing(CellWriteHandlerContext context) { List> cellDataList = context.getCellDataList(); if (CollectionUtils.isEmpty(cellDataList) || cellDataList.size() > 1) { - return false; + return true; } - return context.getHeadData() != null; + return context.getHeadData() == null; } } diff --git a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java index d33a2a74..58b0836a 100644 --- a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java @@ -34,7 +34,7 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { @Override protected void setHeadCellStyle(CellWriteHandlerContext context) { - if (!continueProcessing(context) || headWriteCellStyle == null) { + if (stopProcessing(context) || headWriteCellStyle == null) { return; } WriteCellData cellData = context.getCellDataList().get(0); @@ -43,7 +43,7 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { @Override protected void setContentCellStyle(CellWriteHandlerContext context) { - if (!continueProcessing(context) || CollectionUtils.isEmpty(contentWriteCellStyleList)) { + if (stopProcessing(context) || CollectionUtils.isEmpty(contentWriteCellStyleList)) { return; } WriteCellData cellData = context.getCellDataList().get(0); @@ -55,12 +55,9 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { } } - protected boolean continueProcessing(CellWriteHandlerContext context) { + protected boolean stopProcessing(CellWriteHandlerContext context) { List> cellDataList = context.getCellDataList(); - if (CollectionUtils.isEmpty(cellDataList) || cellDataList.size() > 1) { - return false; - } - return true; + return CollectionUtils.isEmpty(cellDataList) || cellDataList.size() > 1; } }