From 9521f36da324da34fcda38e52a9f6a1f7cfbdcf0 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 29 Jul 2024 17:21:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/basis/TeamConfigMapper.xml |  4 ++--
 .../js/basis/child/teamConfigDataFormTable.js    |  1 -
 .../resources/static/js/basis/teamConfigTable.js | 16 ++++++++--------
 .../pages/basis/child/teamConfigDataForm.html    |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mappers/basis/TeamConfigMapper.xml b/src/main/resources/mappers/basis/TeamConfigMapper.xml
index 3e4b179..eeec697 100644
--- a/src/main/resources/mappers/basis/TeamConfigMapper.xml
+++ b/src/main/resources/mappers/basis/TeamConfigMapper.xml
@@ -69,11 +69,11 @@
 	</update>
 
 	<select id="listTemp"  resultMap="BaseTeamConfigResult">
-		select DISTINCT su.id  ,user_name,user_code,su.team_name,su.team_id,sex,phone
+		select DISTINCT su.id ,user_name,user_code,su.team_name,su.team_id,sex,phone
 		from sys_user su
 		left  join tb_team  team  on  su.team_id=team.id   and  team.del_flag=0
-		WHERE  su.del_flag = 0  and  team.id is null
 		<where>
+			su.del_flag = 0  and  (team.id is null or team.id = '')
 			<if test="keyWord != null and keyWord != ''">
 				and (
 				INSTR(user_name,#{keyWord}) > 0 OR
diff --git a/src/main/resources/static/js/basis/child/teamConfigDataFormTable.js b/src/main/resources/static/js/basis/child/teamConfigDataFormTable.js
index 8d12cfd..14a4d8b 100644
--- a/src/main/resources/static/js/basis/child/teamConfigDataFormTable.js
+++ b/src/main/resources/static/js/basis/child/teamConfigDataFormTable.js
@@ -126,7 +126,6 @@ function getReqParams(page, limit, type) {
 
 // 查询/重置
 function query() {
-    let pattern = new RegExp("[%_<>]");
     pageNum = 1;
     pages(1, limitSize);
 }
diff --git a/src/main/resources/static/js/basis/teamConfigTable.js b/src/main/resources/static/js/basis/teamConfigTable.js
index 5ecbb17..71aa87a 100644
--- a/src/main/resources/static/js/basis/teamConfigTable.js
+++ b/src/main/resources/static/js/basis/teamConfigTable.js
@@ -128,14 +128,14 @@ function reloadTableData() {
 
 // 查询/重置
 function query() {
-    let pattern = new RegExp("[%_<>]");
-    if (pattern.test($("#keyWord").val())) {
-        $("#keyWord").val('');
-        return layer.msg('关键字查询包含特殊字符，请重新输入', {
-            icon: 2,
-            time: 2000 //2秒关闭（如果不配置，默认是3秒）
-        });
-    }
+    // let pattern = new RegExp("[%_<>]");
+    // if (pattern.test($("#keyWord").val())) {
+    //     $("#keyWord").val('');
+    //     return layer.msg('关键字查询包含特殊字符，请重新输入', {
+    //         icon: 2,
+    //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
+    //     });
+    // }
     pageNum = 1;
     pages(1, limitSize);
 }
diff --git a/src/main/resources/static/pages/basis/child/teamConfigDataForm.html b/src/main/resources/static/pages/basis/child/teamConfigDataForm.html
index c1f9d6b..edec8ef 100644
--- a/src/main/resources/static/pages/basis/child/teamConfigDataForm.html
+++ b/src/main/resources/static/pages/basis/child/teamConfigDataForm.html
@@ -23,7 +23,7 @@
 <div id="main-box">
         <form class="layui-form" onsubmit="return false;" >
             <div class="layui-form-itemTemp">
-                <div class="layui-inline" style="padding: 6px  0 0 0;">
+                <div class="layui-inline" style="padding: 6px  10px 0;">
                     <div class="layui-input-inline" >
                         <input type="text" id="keyWord" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入关键字">
                     </div>