From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   84 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 72 insertions(+), 12 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 9a570ac..efcb04d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -84,6 +84,10 @@
         <if test="user.roleId!=null and user.roleId!=''">
             and role_id like concat('%',#{user.roleId},'%')
         </if>
+
+        <if test="user.deptId!=null and user.deptId!=''">
+            and dept_id like concat('%',#{user.deptId},'%')
+        </if>
     </select>
 
     <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
@@ -98,7 +102,7 @@
             jd.id  = #{districtId}
           and bu.is_deleted = '0'
           and jh.is_deleted = '0'
-
+          and jh.role_type = '1'
     </select>
 
     <!--根据手机号查询对应账号和手机号的用户信息-->
@@ -109,8 +113,8 @@
 
     <!--用户详情map-->
     <resultMap id="selectUserDetailMap" type="org.springblade.modules.system.vo.UserDetailVO" autoMapping="true">
-        <id property="id" column="id" />
-        <collection property="deptList"  javaType="java.util.List"
+        <id property="id" column="id"/>
+        <collection property="deptList" javaType="java.util.List"
                     ofType="org.springblade.modules.system.vo.DeptDetailVO" autoMapping="true">
             <id property="id" column="cid"/>
             <id property="level" column="region_level"/>
@@ -182,11 +186,11 @@
         LEFT JOIN jczz_house jhe ON jhe.house_code = jh.house_code
         LEFT JOIN jczz_district jd on jd.aoi_code=jhe.district_code
         <where>
-            <if test="districtId != nuu and districtId != ''">
+            <if test="districtId != null and districtId != ''">
                 and jd.id = #{districtId}
                 and bu.is_deleted = 0
             </if>
-            <if test="building != nuu and building != ''">
+            <if test="building != null and building != ''">
                 and jhe.building=#{building}
             </if>
 
@@ -201,21 +205,77 @@
         where bu.is_deleted = 0 and bud.id is null
         and bu.dept_id!=''
     </select>
+    <select id="getUserListByDeptIds" resultType="org.springblade.modules.system.entity.User">
+        SELECT * FROM blade_user bu where is_deleted = 0
+        and dept_id in
+        <foreach collection="deptIds.split(',')" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 
     <select id="getUserInfoByPropertyId" resultType="org.springblade.modules.system.entity.User"
             parameterType="java.lang.String">
-                SELECT * from blade_user bu  where bu.dept_id in (
-        SELECT
+            SELECT
+            *
+            FROM
+            blade_user bu
+            WHERE
+            bu.role_id = #{roleId}
+            and bu.dept_id IN (
+            SELECT
             id
-        FROM
+            FROM
             ( SELECT id, parent_id FROM blade_dept ORDER BY parent_id, id ) org_query,
-            ( SELECT @id := #{deptId} ) initialisation
-        WHERE
-            FIND_IN_SET( parent_id, @id ) > 0
+            (SELECT	@id := #{deptId} ) initialisation
+            WHERE
+            (FIND_IN_SET( parent_id, @id ) > 0 or FIND_IN_SET( id, @id ) > 0)
             AND @id := CONCAT( @id, ',', id )
-        ) or bu.dept_id=#{deptId}
+            )
 
     </select>
 
 
+
+    <select id="selectUserByDept" resultMap="userResultMap">
+        select * from blade_user where is_deleted = 0
+        and id != 1123598821738675201
+        <if test="deptIdList!=null and deptIdList.size>0">
+            and id in (
+            SELECT
+            user_id
+            FROM
+            blade_user_dept
+            WHERE
+            dept_id IN
+            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
+        ORDER BY create_time desc
+    </select>
+
+
+    <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User">
+        SELECT
+            bu.id,
+            bu.name,
+            bu.phone
+        FROM
+            blade_user bu
+        where 1 = 1
+          and  bu.lat is not null
+          and  bu.lng is not null
+          and IFNULL((
+                 ACOS(
+                 SIN(
+                 (#{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;= 1
+          and  bu.role_id like concat('%','1727864411451359233','%')
+          and bu.is_deleted = 0 and bu.status = 2 limit 1
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3