Commit 3fd2dc02 authored by AfirSraftGarrier's avatar AfirSraftGarrier

Merge remote-tracking branch 'origin/master'

parents 49e6ee2b 35127506
...@@ -14,21 +14,21 @@ ...@@ -14,21 +14,21 @@
</foreach> </foreach>
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
AND create_time &gt; #{startTime} AND pms_use_log.create_time &gt; #{startTime}
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
AND create_time &lt; #{endTime} AND pms_use_log.create_time &lt; #{endTime}
</if> </if>
<if test="null != sn and '' != sn"> <if test="null != sn and '' != sn">
and sn like concat('%',#{sn},'%') and pms_use_log.sn like concat('%',#{sn},'%')
</if> </if>
<if test="null != status and status == 0"> <if test="null != status and status == 0">
and status = #{status} and pms_use_log.status = #{status}
</if> </if>
<if test="null != status and status == 1"> <if test="null != status and status == 1">
and (status = #{status} or status is null) and (pms_use_log.status = #{status} or pms_use_log.status is null)
</if> </if>
and deleted = 0 and pms_use_log.deleted = 0
order by create_time desc order by pms_use_log.create_time desc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
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