Merge remote-tracking branch 'origin/master'
commit
87a80f07f1
|
|
@ -21,7 +21,7 @@ public interface RescueGoodsMapper extends BaseMapper<RescueGoodsB> {
|
||||||
from public.rescue_goods_b t
|
from public.rescue_goods_b t
|
||||||
<where>
|
<where>
|
||||||
<if test="obj.goodsName != null and obj.goodsName !=''">
|
<if test="obj.goodsName != null and obj.goodsName !=''">
|
||||||
t.goods_name LIKE concat('%',#{obj.goodsName},'%')
|
t.goods_name LIKE concat('%',#{obj.goodsName}::text,'%')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
<if test="obj.sortField != null and obj.sortField !=''">
|
<if test="obj.sortField != null and obj.sortField !=''">
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ public interface RescueTeamBMapper extends BaseMapper<RescueTeamB> {
|
||||||
select distinct t2.* from public.rescue_team_b t2
|
select distinct t2.* from public.rescue_team_b t2
|
||||||
<where>
|
<where>
|
||||||
<if test="obj.teamName != null and obj.teamName !=''">
|
<if test="obj.teamName != null and obj.teamName !=''">
|
||||||
and t2.team_name LIKE concat('%',#{obj.teamName},'%')
|
t2.team_name LIKE concat('%',#{obj.teamName}::text,'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="obj.dateSo != null and obj.dateSo.start != null">
|
<if test="obj.dateSo != null and obj.dateSo.start != null">
|
||||||
and t2.valid_end_date <![CDATA[>=]]> #{obj.dateSo.start}
|
and t2.valid_end_date <![CDATA[>=]]> #{obj.dateSo.start}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue