From f3b6086bbc70660d64afc7290d783b540fa8cfd4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 13 May 2024 15:35:59 +0800
Subject: [PATCH] 小区数据处理调整

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 455caa0..12edcb9 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -156,8 +156,21 @@
         left join blade_user_dept bud on bud.user_id = bu.id
         left join blade_dept bd on bud.dept_id = bd.id and bd.is_deleted = 0
         left join blade_region br on br.code = bd.region_code
-        where bu.is_deleted = 0
+        where bu.is_deleted = 0 and bd.dept_category = 2
         and bu.id = #{userId}
+        union all
+        (
+        SELECT
+        bu.*,
+        bd.id as cid,bd.parent_id,bd.ancestors,bd.dept_category,bd.dept_name,bd.full_name,bd.sort,bd.region_code,
+        br.level as region_level
+        FROM blade_user bu
+        left join blade_user_dept bud on bud.user_id = bu.id
+        left join blade_dept bd on bud.dept_id = bd.id and bd.is_deleted = 0
+        left join v_police_region br on br.id = bd.region_code
+        where bu.is_deleted = 0 and bd.dept_category = 1
+        and bu.id = #{userId}
+        )
     </select>
 
 

--
Gitblit v1.9.3