From 0fc60e2f5f91d818b9065e6d121bf19abb6f8271 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 26 Aug 2024 17:55:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF-=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E4=BA=860=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 94ee6274..e893673d 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2634,18 +2634,24 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         continue;
                     }
                     String cellValue = null;
+                    String stringCellValue = cell.getStringCellValue();
                     if (!(CellType.NUMERIC == cell.getCellType() && HSSFDateUtil.isCellDateFormatted(cell))) {
                         //设置单元格类型
                         if (y == 0){
                             // 条文号精度丢失问题
                             try {
-                                double numericCellValue = cell.getNumericCellValue();
-                                BigDecimal bigDecimal = BigDecimal.valueOf(numericCellValue);
-                                String str = String.valueOf(bigDecimal);
-                                if (str.endsWith(".0")){
-                                    str = str.substring(0, str.length() - 2);
+                                if (StringUtils.isNotBlank(stringCellValue)){
+                                    double numericCellValue = cell.getNumericCellValue();
+                                    BigDecimal bigDecimal = BigDecimal.valueOf(numericCellValue);
+                                    String str = String.valueOf(bigDecimal);
+                                    if (str.endsWith(".0")){
+                                        str = str.substring(0, str.length() - 2);
+                                    }
+                                    cell.setCellValue(str);
+                                }else {
+                                    cell.setCellValue("");
                                 }
-                                cell.setCellValue(str);
+
                             } catch (Exception e) {
                             }
                         }
@@ -2663,7 +2669,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
                             cellValue = df.format(d);
                         }else {
-                            cellValue = cell.getStringCellValue();
+                            cellValue = stringCellValue;
                         }
                     }
                     //