From d5ef554e5e3b4062f464d59a2c99a32db3812c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 29 Aug 2024 14:12:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20RegexUtils#extrac?=
 =?UTF-8?q?tFromString=20=E6=96=B9=E6=B3=95=E6=9C=AA=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9Enull=E4=B8=8D=E8=BF=94=E5=9B=9E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/core/utils/regex/RegexUtils.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
index b8b12d43..6dde1299 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
@@ -21,7 +21,8 @@ public final class RegexUtils extends ReUtil {
      */
     public static String extractFromString(String input, String regex, String defaultInput) {
         try {
-            return ReUtil.get(regex, input, 1);
+            String str = ReUtil.get(regex, input, 1);
+            return str == null ? defaultInput : str;
         } catch (Exception e) {
             return defaultInput;
         }