From 21545563f9ab95ca8f39d8016e1e541d87a6c30d Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 19 Apr 2022 16:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FileSplitItemsEOController.java    | 15 +++++++++++++++
 .../service/impl/FileSplitItemsEOServiceImpl.java |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
index c51ca5b84..e29f44a90 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
@@ -263,4 +263,19 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
         List<Map<String, Object>> list = languageSwitchService.queryCondition(flag, cut);
         return Result.OK(list);
     }
+
+    /**
+     * 表单中英文切换
+     *
+     * @return
+     */
+    @AutoLog(value = "表单中英文切换")
+    @ApiOperation(value="表单中英文切换", notes="表单中英文切换")
+    @GetMapping(value = "/getForm")
+    @RequiresPermissions("split:sarFileSplitItems:page")
+    public Result<List<Map<String, Object>>> getForm(@RequestParam(name = "flag") String flag,
+                                                     @RequestParam(name = "cut") String cut) {
+        List<Map<String, Object>> list = languageSwitchService.getForm(flag, cut);
+        return Result.OK(list);
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index b1fefd12b..24bbbe2d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2186,7 +2186,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 }
                                 countError++;
                             }
-                            String regexPerson = "^[\\u4e00-\\u9fa5]{0,}\\([A-Za-z0-9.]*\\)$";
+                            String regexPerson = "^[\\u4e00-\\u9fa5A-Za-z0-9]{0,}\\([A-Za-z0-9.]*\\)$";
                             value = value.replace("，",",");
                             if(StringUtils.isNotBlank(value)) {
                                 String[] userNames = value.split(",");