From a331c3967ea6d27a3c6d46e59c0a0f96ca50e409 Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Fri, 15 May 2026 17:50:28 +0800 Subject: [PATCH] 5-15 - fix --- .../src/main/resources/mapper/HiddenMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 5e69236..4049d5c 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -22,14 +22,15 @@ left join department hfd on hfd.id = hfu.department_id left join user au on au.id = h.accept_user_id - left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status = 3 + left join safety_environmental_inspection i on i.inspection_id = h.foreign_key and i.status = 3 and h.source in (2, 3) left join key_project kp on kp.key_project_id = i.key_project_id - left join ai_alarm aa on h.source = 1 and h.foreign_key = aa.id + left join ai_alarm aa on h.foreign_key = aa.id and h.source = 1 left join key_project kp2 on kp2.key_project_id = aa.key_project_id left join hidden_rectification_record hrr on hrr.hidden_id = h.hidden_id and hrr.delete_enum = 'FALSE' left join hidden_accept_record har on har.hidden_id = h.hidden_id and har.delete_enum = 'FALSE' and har.state = 1 h.delete_enum = 'FALSE' + AND (h.source NOT IN (2, 3) OR i.inspection_id IS NOT NULL) and h.hidden_desc LIKE CONCAT('%', #{params.hiddenDesc}, '%')