解决白柸预测导出BUG

jjt-biz/src/main/java/com/jjt/order/utils/OrderExportUtil.java

@@ -322,8 +322,10 @@ public class OrderExportUtil {
                 }
             }
             int er = num.get() - 1;
-            for (int i = 0; i < 8; i++) {
-                sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+            if (er - sr > 1) {
+                for (int i = 0; i < 8; i++) {
+                    sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+                }
             }
         });
     }
@@ -396,8 +398,10 @@ public class OrderExportUtil {
                 }
             }
             int er = num.get() - 1;
-            for (int i = 0; i < 7; i++) {
-                sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+            if (er - sr > 1) {
+                for (int i = 0; i < 7; i++) {
+                    sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+                }
             }
         });
     }

jjt-biz/src/main/java/com/jjt/order/utils/OrderGsmExportUtil.java

@@ -327,8 +327,10 @@ public class OrderGsmExportUtil {
                 }
             }
             int er = num.get() - 1;
-            for (int i = 0; i < 10; i++) {
-                sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+            if (er - sr > 1) {
+                for (int i = 0; i < 10; i++) {
+                    sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+                }
             }
         });
     }
@@ -402,8 +404,10 @@ public class OrderGsmExportUtil {
                 }
             }
             int er = num.get() - 1;
-            for (int i = 0; i < 8; i++) {
-                sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+            if (er - sr > 1) {
+                for (int i = 0; i < 7; i++) {
+                    sheet.addMergedRegion(new CellRangeAddress(sr, er, i, i));
+                }
             }
         });
     }