Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加网格按用户搜索

Browse Source
This commit is contained in:
TS-QD1 2023-05-29 22:05:15 +08:00
parent c637b2a344
commit 6eca98293e
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml
View File

@ -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

6
module-map/src/main/resources/templates/grid/grid/default/list.html
View File

@ -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()