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) - ) + + 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) + ) + + + or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15)) + ) 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) - ) + + 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) + ) + + + or (d.parent_id in (select dept_id from sys_dept where `zone` = 5 or `zone` = 15)) + ) and u.dept_id != 405