From fab130374666a61367f02c630b12cec55a535a66 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 21 Oct 2021 18:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AF=8D=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/ink/wgink/util/RegexUtil.java    | 14 ++++++++++++++
 .../resources/templates/position/user/list.html    |  1 +
 2 files changed, 15 insertions(+)

diff --git a/basic-util/src/main/java/ink/wgink/util/RegexUtil.java b/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
index 7bfb0ab1..03699676 100644
--- a/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
+++ b/basic-util/src/main/java/ink/wgink/util/RegexUtil.java
@@ -83,6 +83,10 @@ public class RegexUtil {
      * 字母
      */
     private static final Pattern PATTERN_LETTER = Pattern.compile("[a-zA-Z]+");
+    /**
+     * 字母和数字
+     */
+    private static final Pattern PATTERN_LETTER_OR_NUMBER = Pattern.compile("[a-zA-Z0-9]+");
     /**
      * 中文
      */
@@ -278,6 +282,16 @@ public class RegexUtil {
         return PATTERN_LETTER.matcher(input).matches();
     }
 
+    /**
+     * 判断是字母或数字
+     *
+     * @param input
+     * @return
+     */
+    public static boolean isLetterOrNumber(String input) {
+        return PATTERN_LETTER_OR_NUMBER.matcher(input).matches();
+    }
+
     /**
      * 判断是中文
      *
diff --git a/service-position/src/main/resources/templates/position/user/list.html b/service-position/src/main/resources/templates/position/user/list.html
index 096d42a5..42f307b6 100644
--- a/service-position/src/main/resources/templates/position/user/list.html
+++ b/service-position/src/main/resources/templates/position/user/list.html
@@ -210,6 +210,7 @@
                     title: '选择用户',
                     width: '500px',
                     height: '500px',
+                    closeBtn: 0,
                     onClose: function() {
                         var selectedUsers = top.dialog.dialogData.selectedDepartmentUsers;
                         if(selectedUsers != null && selectedUsers.length > 0) {