From 954a476f9a8c1072444e0b76a58d44cb84d16660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Mon, 8 Jun 2026 21:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/UserMapper.xml    | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 33aeb7b4..2b9fff6b 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -850,11 +850,16 @@
             AND (
             (u.law_certificate_num is not null AND u.law_certificate_num !="")
             or (d.`zone` = 5 or d.`zone` = 15)
-            or EXISTS (
-            SELECT 1 FROM sys_dept anc
-            WHERE (anc.`zone` = 5 OR anc.`zone` = 15)
-            AND FIND_IN_SET(anc.dept_id, d.ancestors)
-            )
+            <if test="deptId != null">
+                or EXISTS (
+                        SELECT 1 FROM sys_dept anc
+                        WHERE (anc.`zone` = 5 OR anc.`zone` = 15)
+                        AND FIND_IN_SET(anc.dept_id, d.ancestors)
+                    )
+            </if>
+            <if test="deptId == null">
+                or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
+            </if>
             )
         </if>
         and u.dept_id != 405
@@ -897,11 +902,16 @@
             AND (
             (u.law_certificate_num is not null AND u.law_certificate_num !="")
             or (d.`zone` = 5 or d.`zone` = 15)
-            or EXISTS (
-            SELECT 1 FROM sys_dept anc
-            WHERE (anc.`zone` = 5 OR anc.`zone` = 15)
-            AND FIND_IN_SET(anc.dept_id, d.ancestors)
-            )
+            <if test="deptId != null">
+                or EXISTS (
+                SELECT 1 FROM sys_dept anc
+                WHERE (anc.`zone` = 5 OR anc.`zone` = 15)
+                AND FIND_IN_SET(anc.dept_id, d.ancestors)
+                )
+            </if>
+            <if test="deptId == null">
+                or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
+            </if>
             )
         </if>
         and u.dept_id != 405