|
|
@ -158,9 +158,8 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { |
|
|
|
int lastCol = i; |
|
|
|
int lastCol = i; |
|
|
|
int lastRow = j; |
|
|
|
int lastRow = j; |
|
|
|
for (int k = i + 1; k < headList.size(); k++) { |
|
|
|
for (int k = i + 1; k < headList.size(); k++) { |
|
|
|
if (headList.get(k).getHeadNameList().get(j).equals(headName) |
|
|
|
boolean flag = (j - 1 >= 0) && !headList.get(k).getHeadNameList().get(j - 1).equals(headName); |
|
|
|
&& (j - 1 >= 0) |
|
|
|
if (headList.get(k).getHeadNameList().get(j).equals(headName) && flag) { |
|
|
|
&& !headList.get(k).getHeadNameList().get(j-1).equals(headName)) { |
|
|
|
|
|
|
|
alreadyRangeSet.add(k + "-" + j); |
|
|
|
alreadyRangeSet.add(k + "-" + j); |
|
|
|
lastCol = k; |
|
|
|
lastCol = k; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|