From ccb0dcd8d5837509a9b419a97fc7dbab9c9d820b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 13 Mar 2025 16:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E5=80=BC=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/datacollection/bo/VariableArchiveExcelBO.java     | 5 ++---
 .../salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java b/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java
index aaa4f71b4..56f7a14b0 100644
--- a/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java
+++ b/src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java
@@ -1,7 +1,7 @@
 package com.engine.salary.entity.datacollection.bo;
 
+import cn.hutool.core.util.NumberUtil;
 import com.engine.core.impl.Service;
-import com.engine.salary.constant.SalaryArchiveConstant;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandleParam;
@@ -23,7 +23,6 @@ import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.*;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -232,7 +231,7 @@ public class VariableArchiveExcelBO extends Service {
                     if (optionalVariableItem.isPresent()) {
                         VariableItemPO variableItemPO = optionalVariableItem.get();
                         // 数值类型判断
-                        boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal);
+                        boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal);
                         if (isNotNumber) {
                             Map<String, String> errorMessageMap = Maps.newHashMap();
                             errorMessageMap.put("message", rowindex + key + numberErr);
diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
index 41b6050bb..fb69bb2df 100644
--- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
+++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
@@ -1,7 +1,7 @@
 package com.engine.salary.entity.salaryarchive.bo;
 
+import cn.hutool.core.util.NumberUtil;
 import com.engine.core.impl.Service;
-import com.engine.salary.constant.SalaryArchiveConstant;
 import com.engine.salary.constant.SalaryDefaultTenantConstant;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveInitImportDTO;
@@ -35,7 +35,6 @@ import weaver.hrm.User;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -826,7 +825,7 @@ public class SalaryArchiveExcelBO extends Service {
         if (isEnable) {
             SalaryItemPO salaryItemPO = optionalSalaryItem.get();
             // 数值类型判断
-            boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal);
+            boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal);
             if (isNotNumber) {
                 Map<String, String> errorMessageMap = Maps.newHashMap();
                 errorMessageMap.put("message", rowindex + key + numberErr);