Commit 2a16ce94 by zhuyajie

fixbug

parent 8de659e6
...@@ -130,7 +130,10 @@ ...@@ -130,7 +130,10 @@
WHERE WHERE
1 = 1 1 = 1
<if test="startTime != null and endTime != null"> <if test="startTime != null and endTime != null">
AND i.send_time BETWEEN #{startTime} AND #{endTime} AND (
(i.send_time BETWEEN #{startTime} AND #{endTime} )
OR (p.start_time >= #{startTime} AND p.end_time &lt;= #{endTime})
)
</if> </if>
<if test="pushStatus != null"> <if test="pushStatus != null">
AND i.push_status = #{pushStatus} AND i.push_status = #{pushStatus}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment