diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index d0b3691..30f2b3c 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -62,11 +62,16 @@ and kp.xgf_corpinfo_id = #{params.xgfCorpinfoId} + + and EXISTS ( + SELECT 1 FROM hidden_find_user hf2 + LEFT JOIN user hfu2 ON hfu2.id = hf2.find_user_id + WHERE hf2.hidden_id = h.hidden_id AND hf2.delete_enum = 'FALSE' + AND hfu2.name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%') + ) + GROUP BY h.id - - HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%') - ORDER BY h.create_time desc diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 03d6ab9..f930142 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -247,6 +247,7 @@ left join safety_environmental_inspection sei on kp.key_project_id = sei.key_project_id AND sei.delete_enum = 'FALSE' and sei.status != 0 left join hidden h on sei.inspection_id = h.foreign_key AND h.delete_enum = 'FALSE' where kp.delete_enum = 'FALSE' + and kp.apply_status != 0 and jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId} AND kp.project_name like concat('%',#{params.projectName},'%')