From b5cf2a962dabaf01405c95aa78b85f3e1a32f75c 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 22:37:41 +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

---
 .../src/main/resources/mapper/system/UserMapper.xml       | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 2b9fff6b..cc7b52f6 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -850,14 +850,14 @@
             AND (
             (u.law_certificate_num is not null AND u.law_certificate_num !="")
             or (d.`zone` = 5 or d.`zone` = 15)
-            <if test="deptId != null">
+            <if test="userName != null and userName != ''">
                 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">
+            <if test="userName == null or userName == ''">
                 or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
             </if>
             )
@@ -902,14 +902,14 @@
             AND (
             (u.law_certificate_num is not null AND u.law_certificate_num !="")
             or (d.`zone` = 5 or d.`zone` = 15)
-            <if test="deptId != null">
+            <if test="userName != null and userName != ''">
                 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">
+            <if test="userName == null or userName == ''">
                 or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15))
             </if>
             )