From bdfb1bfaf5dc5d7318c632fcc6fdf3ffacbd075f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 15 Apr 2024 17:21:29 +0800
Subject: [PATCH] 社区管理员查询轮播图+报事报修查询优化

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   55 +++++++++++++++++++++++++++----------------------------
 1 files changed, 27 insertions(+), 28 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 3b4b129..b4bd4a0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -74,7 +74,32 @@
     </select>
 
     <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
-        SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+        SELECT id,
+               tenant_id,
+               user_type,
+               account,
+               name,
+               real_name,
+               email,
+               phone,
+               birthday,
+               role_id,
+               dept_id,
+               post_id
+        FROM blade_user ${ew.customSqlSegment}
+        <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>
     </select>
 
     <!--按条件查询用户信息-->
@@ -233,33 +258,7 @@
             )
 
     </select>
-    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
 
-        SELECT
-        bu.id,
-        bu.tenant_id,
-        bu.code,
-        bu.user_type,
-        bu.account,
-        bu.name,
-        bu.real_name,
-        bu.avatar,
-        bu.email,
-        bu.phone,
-        bu.birthday
-        FROM
-        blade_user bu
-        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
-        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>
-            and jd.id  in
-            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            and bu.is_deleted = 0
-        </where>
-    </select>
 
 
     <select id="selectUserByDept" resultMap="userResultMap">
@@ -300,7 +299,7 @@
                  - (bu.lng * 3.1415) / 180)) * 6370.996
                  ), 2) &lt;= 1
           and  bu.role_id like concat('%','1727864411451359233','%')
-          and bu.is_deleted = 0 and limit 1
+          and bu.is_deleted = 0 and bu.status = 2 limit 1
     </select>
 
 

--
Gitblit v1.9.3