Compare commits

..

No commits in common. "f5d239e8796dfd194cc8b259abc6f38c70546583" and "a83d09f0d47a80282ed8f85c26db30c770fb2458" have entirely different histories.

1 changed files with 1 additions and 3 deletions

View File

@ -68,9 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND mps.prop_id = #{propId}
</if>
<if test="keyWord != null and keyWord != ''">
AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%')
or mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})
or mt2.type_name like concat('%',#{keyWord}))
AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%'))
</if>
<if test="beginTime != null and endTime != null and beginTime != '' and endTime != null">
AND m.create_time between #{beginTime} and #{endTime}