|
@@ -23,7 +23,7 @@
|
|
|
select b.*, a.status, a.push_id as msgId
|
|
|
from msg_web_push AS a
|
|
|
join msg_alarm AS b on a.alarm_id = b.alarm_id
|
|
|
- join base_camera_management AS c on b.camera_code = c.camera_code
|
|
|
+ join base_railway_management AS c on b.railway_code = c.railway_code
|
|
|
<where>
|
|
|
<if test="userId != null and userId != ''">
|
|
|
and a.receive_by = #{userId}
|
|
@@ -46,12 +46,12 @@
|
|
|
<if test="railwayCode != null and railwayCode != ''">
|
|
|
and c.railway_code = #{railwayCode}
|
|
|
</if>
|
|
|
- <if test="beginMile != null and beginMile != ''">
|
|
|
- and c.begin_mile >= #{beginMile}
|
|
|
- </if>
|
|
|
- <if test="endMile != null and endMile != ''">
|
|
|
- and c.end_mile <= #{endMile}
|
|
|
- </if>
|
|
|
+<!-- <if test="beginMile != null and beginMile != ''">-->
|
|
|
+<!-- and c.begin_mile >= #{beginMile}-->
|
|
|
+<!-- </if>-->
|
|
|
+<!-- <if test="endMile != null and endMile != ''">-->
|
|
|
+<!-- and c.end_mile <= #{endMile}-->
|
|
|
+<!-- </if>-->
|
|
|
</where>
|
|
|
</select>
|
|
|
|