5-13 - fix
parent
1c5cee2be4
commit
a8b09c23c6
|
|
@ -62,11 +62,16 @@
|
||||||
<if test="params.xgfCorpinfoId != null">
|
<if test="params.xgfCorpinfoId != null">
|
||||||
and kp.xgf_corpinfo_id = #{params.xgfCorpinfoId}
|
and kp.xgf_corpinfo_id = #{params.xgfCorpinfoId}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="params.hiddenFindUserName != null and params.hiddenFindUserName != ''">
|
||||||
|
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}, '%')
|
||||||
|
)
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
GROUP BY h.id
|
GROUP BY h.id
|
||||||
<if test="params.hiddenFindUserName != null and params.hiddenFindUserName != ''">
|
|
||||||
HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%')
|
|
||||||
</if>
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
h.create_time desc
|
h.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
|
|
@ -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 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'
|
left join hidden h on sei.inspection_id = h.foreign_key AND h.delete_enum = 'FALSE'
|
||||||
where kp.delete_enum = 'FALSE'
|
where kp.delete_enum = 'FALSE'
|
||||||
|
and kp.apply_status != 0
|
||||||
and jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId}
|
and jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId}
|
||||||
<if test="params.projectName != null and params.projectName != ''">
|
<if test="params.projectName != null and params.projectName != ''">
|
||||||
AND kp.project_name like concat('%',#{params.projectName},'%')
|
AND kp.project_name like concat('%',#{params.projectName},'%')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue