From c02703a1aef70d2bb830c63652df72c98403db39 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 10:58:19 +0800
Subject: [PATCH] 小区用户支持栋，单元+名字查询

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 9b1f1ee..f315c40 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -258,6 +258,16 @@
                 #{item}
             </foreach>
             and bu.is_deleted = 0
+            and jh.relationship !=18
+            <if test="param2 != null and param2 !=''">
+                and jhe.building like concat('%',#{param2},'%')
+            </if>
+            <if test="param3 != null and param3 !=''">
+                and jhe.unit like concat('%',#{param3},'%')
+            </if>
+            <if test="param4 != null and param4 !=''">
+                and jh.name like concat('%',#{param4},'%')
+            </if>
         </where>
     </select>
 
@@ -284,7 +294,9 @@
 
     <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User">
         SELECT
-            bu.*
+            bu.id,
+            bu.name,
+            bu.phone
         FROM
             blade_user bu
         where 1 = 1
@@ -296,9 +308,9 @@
                  (#{latitude} * 3.1415) / 180) * SIN((bu.lat * 3.1415) / 180) +
                  COS((#{latitude} * 3.1415) / 180) * COS((bu.lat * 3.1415) / 180) * COS((#{longitude} * 3.1415) / 180
                  - (bu.lng * 3.1415) / 180)) * 6370.996
-                 ), 2) &lt;= 0.5
+                 ), 2) &lt;= 1
           and  bu.role_id like concat('%','1727864411451359233','%')
-          and bu.is_deleted = 0
+          and bu.is_deleted = 0 and bu.status = 2 limit 1
     </select>
 
 

--
Gitblit v1.9.3