From 6eca98293e75e610b2cea2049fbd81a36d839143 Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Mon, 29 May 2023 22:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC=E6=8C=89?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/grid/grid-mapper.xml       | 27 +++++++++++++++++++
 .../templates/grid/grid/default/list.html     |  6 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
index 1aa42a05..cb3f5971 100644
--- a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
+++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
@@ -251,6 +251,33 @@
         AND
             t1.grid_name LIKE CONCAT('%', #{keywords}, '%')
         </if>
+        <if test="userKeywords != null and userKeywords != ''">
+        AND
+            t1.grid_id IN (
+                SELECT
+                    mgr.grid_id
+                FROM
+                    map_grid_relation mgr
+                WHERE
+                    mgr.relation_id IN (
+                        SELECT
+                            su.user_id
+                        FROM
+                            sys_user su
+                        WHERE
+                            su.is_delete = 0
+                        AND (
+                            su.user_username LIKE CONCAT('%', #{userKeywords}, '%')
+                            OR
+                            su.user_name LIKE CONCAT('%', #{userKeywords}, '%')
+                            OR
+                            su.user_phone LIKE CONCAT('%', #{userKeywords}, '%')
+                            OR
+                            su.user_email LIKE CONCAT('%', #{userKeywords}, '%')
+                        )
+                    )
+            )
+        </if>
         <if test="gridIds != null and gridIds.size > 0">
         AND
             t1.grid_id IN
diff --git a/module-map/src/main/resources/templates/grid/grid/default/list.html b/module-map/src/main/resources/templates/grid/grid/default/list.html
index 7f8a551f..dfb3c60d 100644
--- a/module-map/src/main/resources/templates/grid/grid/default/list.html
+++ b/module-map/src/main/resources/templates/grid/grid/default/list.html
@@ -23,7 +23,10 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入网格名称">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="userKeywords" class="layui-input search-item search-item-width-200" placeholder="输入用户名、昵称">
                         </div>
                         <div class="layui-inline table-select-area">
                             <input type="hidden" id="areaCode">
@@ -207,6 +210,7 @@
                 url: top.restAjax.path(tableUrl, []),
                 where: {
                     keywords: $('#keywords').val(),
+                    userKeywords: $('#userKeywords').val(),
                     startTime: $('#startTime').val(),
                     endTime: $('#endTime').val(),
                     areaCodeLike: $('#areaCode').val()