fix: excel download bug

Author: xiaohuangdou666

server/src/main/java/datart/server/base/dto/chart/ChartColumn.java

@@ -80,7 +80,7 @@ public PoiNumFormat getNumFormat(){
 
     public List<ChartColumn> getLeafNodes(){
         List<ChartColumn> leafNodes = new ArrayList<>();
-        if (this.leafNum == 1){
+        if (this.leafNum == 1 && !this.isGroup){
             leafNodes.add(this);
         }
         for (ChartColumn child : children) {

server/src/main/java/datart/server/common/PoiConvertUtils.java

@@ -91,7 +91,7 @@ private static Map<String, String> getAliasMap(List<ChartColumn> dataColumns){
     private static void convertGroupHeaderData(List<ChartColumn> dataStyles, Map<Integer, List<Column>> rowMap, int rowNum, List<CellRangeAddress> cellRangeAddresses, Map<String, String> aliasMap){
         for (ChartColumn dataStyle : dataStyles) {
             int columnNum = putDataIntoListMap(rowMap, rowNum, dataStyle);
-            if (dataStyle.getLeafNum()<=1){
+            if (dataStyle.getLeafNum()<=1 && !dataStyle.isGroup()){
                 Column column = rowMap.get(rowNum).get(columnNum);
                 column.setName(aliasMap.getOrDefault(column.getName(), column.getName()));
                 for (int i = rowNum+1; i < rowMap.size(); i++) {
@@ -100,7 +100,7 @@ private static void convertGroupHeaderData(List<ChartColumn> dataStyles, Map<Int
                 if (rowMap.size()-1 > rowNum){
                     cellRangeAddresses.add(new CellRangeAddress(rowNum, rowMap.size()-1, columnNum, columnNum));
                 }
-            } else {
+            } else if (dataStyle.getLeafNum()>1){
                 for (int i = 1; i < dataStyle.getLeafNum(); i++) {
                     putDataIntoListMap(rowMap, rowNum, new ChartColumn());
                 }