From e2aae1241434ea11a0c3387f36569027af07c8c0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 9 Nov 2023 14:31:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E6=94=AF=E6=8C=81UTF?=
 =?UTF-8?q?8=E7=BC=96=E7=A0=81=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/laws/common/util/ImportUtil.java | 2 +-
 .../main/java/com/jero/modules/split/common/FileUnZip.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 3a60e9a5..34a81827 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -134,7 +134,7 @@ public class ImportUtil {
                             try {
                                 standardNumber = cell.toString().trim();
                                 // 必须是数字
-                                if (!standardNumber.matches("^[0-9]*$")) {
+                                if (!standardNumber.matches("^[0-9]+(\\.[0-9]+)?$")) {
                                     log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误，标准号必须为数字 ");
                                     errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误，标准号必须为数字 ");
                                     break;
diff --git a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index d23528bd..b6f8b663 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -31,7 +31,12 @@ public class FileUnZip {
         if (!pathFile.exists()) {
             pathFile.mkdirs();
         }
-        ZipFile zip = new ZipFile(zipFile,"gbk");
+        ZipFile zip = null;
+        try {
+            zip = new ZipFile(zipFile,"gbk");
+        } catch (Exception e) {
+            zip = new ZipFile(zipFile,"utf-8");
+        }
         String orgMkdirs = "";
         int count = 0;
         for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) {