Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -70,6 +70,7 @@
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
         left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
+            <if test="facilityName != null  and facilityName != ''"> and facility.facility_name like concat('%', #{facilityName}, '%')</if>
             <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>
             <if test="warningType != null  and warningType != ''"> and warning.warning_type = #{warningType}</if>